ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc. unmanaged cores: output to /Assets and also /output if it exists 

Makefiles still produce .dll instead of .dll.so on Linux
see #2725
This commit is contained in:
YoshiRulz 2021-07-18 08:09:22 +10:00
parent 443c9830bb
commit ceedf1fef5
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
6 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lynx/make/Makefile
View File

@ -18,8 +18,8 @@ LDFLAGS_32 = -static -static-libgcc -static-libstdc++
LDFLAGS_64 = LDFLAGS_64 =
LDFLAGS = -shared $(LDFLAGS_$(ARCH)) $(CXXFLAGS) LDFLAGS = -shared $(LDFLAGS_$(ARCH)) $(CXXFLAGS)
DEST_32 = ../../output/dll DEST_64 = ../../Assets/dll
DEST_64 = ../../output/dll DESTCOPY_64 = ../../output/dll
SRCS = \ SRCS = \
../c65c02.cpp \ ../c65c02.cpp \
@ -51,3 +51,6 @@ clean:
install: install:
$(CP) $(TARGET) $(DEST_$(ARCH)) $(CP) $(TARGET) $(DEST_$(ARCH))
ifneq ("$(wildcard $(DESTCOPY_$(ARCH)))", "")
$(CP) $(TARGET) $(DESTCOPY_$(ARCH))
endif

12
lynx/msvc/bizlynx.vcxproj
View File

@ -39,12 +39,6 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>..\..\output\dll</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>..\..\output\dll</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
@ -115,4 +109,10 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
<Target Name="CopyToHawkAssets" AfterTargets="PostBuildEvent">
<Copy SourceFiles="$(OutDir)bizlynx.dll" DestinationFolder="$(ProjectDir)../../Assets/dll" SkipUnchangedFiles="true" />
</Target>
<Target Name="CopyToHawkOutput" AfterTargets="PostBuildEvent" Condition=" Exists('$(ProjectDir)../../output/dll') ">
<Copy SourceFiles="$(OutDir)bizlynx.dll" DestinationFolder="$(ProjectDir)../../output/dll" SkipUnchangedFiles="true" />
</Target>
</Project> </Project>

7
quicknes/make/Makefile
View File

@ -22,8 +22,8 @@ LDFLAGS_32 = -static -static-libgcc -static-libstdc++
LDFLAGS_64 = LDFLAGS_64 =
LDFLAGS = -shared $(LDFLAGS_$(ARCH)) $(CXXFLAGS) LDFLAGS = -shared $(LDFLAGS_$(ARCH)) $(CXXFLAGS)
DEST_32 = ../../output/dll DEST_64 = ../../Assets/dll
DEST_64 = ../../output/dll DESTCOPY_64 = ../../output/dll
SRCS = \ SRCS = \
../nes_emu/abstract_file.cpp \ ../nes_emu/abstract_file.cpp \
@ -80,3 +80,6 @@ clean:
install: install:
$(CP) $(TARGET) $(DEST_$(ARCH)) $(CP) $(TARGET) $(DEST_$(ARCH))
ifneq ("$(wildcard $(DESTCOPY_$(ARCH)))", "")
$(CP) $(TARGET) $(DESTCOPY_$(ARCH))
endif

12
quicknes/msvc/libquicknes.vcxproj
View File

@ -121,12 +121,6 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>..\..\output\dll\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>..\..\output\dll\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
@ -168,4 +162,10 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
<Target Name="CopyToHawkAssets" AfterTargets="PostBuildEvent">
<Copy SourceFiles="$(OutDir)libquicknes.dll" DestinationFolder="$(ProjectDir)../../Assets/dll" SkipUnchangedFiles="true" />
</Target>
<Target Name="CopyToHawkOutput" AfterTargets="PostBuildEvent" Condition=" Exists('$(ProjectDir)../../output/dll') ">
<Copy SourceFiles="$(OutDir)libquicknes.dll" DestinationFolder="$(ProjectDir)../../output/dll" SkipUnchangedFiles="true" />
</Target>
</Project> </Project>

7
wonderswan/make/Makefile
View File

@ -22,8 +22,8 @@ LDFLAGS_32 = -static -static-libgcc -static-libstdc++
LDFLAGS_64 = LDFLAGS_64 =
LDFLAGS = -shared $(LDFLAGS_$(ARCH)) $(CXXFLAGS) LDFLAGS = -shared $(LDFLAGS_$(ARCH)) $(CXXFLAGS)
DEST_32 = ../../output/dll DEST_64 = ../../Assets/dll
DEST_64 = ../../output/dll DESTCOPY_64 = ../../output/dll
SRCS = \ SRCS = \
../eeprom.cpp \ ../eeprom.cpp \
@ -54,3 +54,6 @@ clean:
install: install:
$(CP) $(TARGET) $(DEST_$(ARCH)) $(CP) $(TARGET) $(DEST_$(ARCH))
ifneq ("$(wildcard $(DESTCOPY_$(ARCH)))", "")
$(CP) $(TARGET) $(DESTCOPY_$(ARCH))
endif

12
wonderswan/msvc/bizswan.vcxproj
View File

@ -39,12 +39,6 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>..\..\output\dll\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>..\..\output\dll\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
@ -116,4 +110,10 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
<Target Name="CopyToHawkAssets" AfterTargets="PostBuildEvent">
<Copy SourceFiles="$(OutDir)bizswan.dll" DestinationFolder="$(ProjectDir)../../Assets/dll" SkipUnchangedFiles="true" />
</Target>
<Target Name="CopyToHawkOutput" AfterTargets="PostBuildEvent" Condition=" Exists('$(ProjectDir)../../output/dll') ">
<Copy SourceFiles="$(OutDir)bizswan.dll" DestinationFolder="$(ProjectDir)../../output/dll" SkipUnchangedFiles="true" />
</Target>
</Project> </Project>