From 35411fed256dd9e44b0e249aafa962f06115be5b Mon Sep 17 00:00:00 2001 From: darkstar Date: Mon, 29 Apr 2019 11:34:13 +0200 Subject: [PATCH 1/3] MSVC: Add project files for MSVC2019 Microsoft removed (or at least deprecated) support for global per-user property sheets. This was a nice feature to tell MSVC where to look for includes/libraries that are not part of the project (like SDL, png, etc.) Removal of this feature means that all property sheets need to be part of the project/solution. Since I don't want to force everyone to use the same include/library paths than I do, I had to use a workaround. I added a property sheet "localdirs.props" that adds the include and library paths from the environment variables INCLUDE and LIB32 respectively (64bit build is still broken currently, so only LIB32 is needed) Please set up these variables before opening/building the solution, so that your local libs and include files can be found. If anyone finds a smarter solution to this, feel free to submit a PR :) --- src/win/msvc/vc16/VARCem.sln | 31 + src/win/msvc/vc16/VARCem.vcxproj | 793 ++++++++++ src/win/msvc/vc16/VARCem.vcxproj.filters | 1768 ++++++++++++++++++++++ src/win/msvc/vc16/VARCem.vcxproj.user | 19 + src/win/msvc/vc16/global.props | 14 + src/win/msvc/vc16/localdirs.props | 11 + 6 files changed, 2636 insertions(+) create mode 100644 src/win/msvc/vc16/VARCem.sln create mode 100644 src/win/msvc/vc16/VARCem.vcxproj create mode 100644 src/win/msvc/vc16/VARCem.vcxproj.filters create mode 100644 src/win/msvc/vc16/VARCem.vcxproj.user create mode 100644 src/win/msvc/vc16/global.props create mode 100644 src/win/msvc/vc16/localdirs.props diff --git a/src/win/msvc/vc16/VARCem.sln b/src/win/msvc/vc16/VARCem.sln new file mode 100644 index 0000000..2a06422 --- /dev/null +++ b/src/win/msvc/vc16/VARCem.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28803.202 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VARCem", "VARCem.vcxproj", "{6E445F28-CA8F-430F-8CCF-C59C53516AC5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6E445F28-CA8F-430F-8CCF-C59C53516AC5}.Debug|x64.ActiveCfg = Debug|x64 + {6E445F28-CA8F-430F-8CCF-C59C53516AC5}.Debug|x64.Build.0 = Debug|x64 + {6E445F28-CA8F-430F-8CCF-C59C53516AC5}.Debug|x86.ActiveCfg = Debug|Win32 + {6E445F28-CA8F-430F-8CCF-C59C53516AC5}.Debug|x86.Build.0 = Debug|Win32 + {6E445F28-CA8F-430F-8CCF-C59C53516AC5}.Release|x64.ActiveCfg = Release|x64 + {6E445F28-CA8F-430F-8CCF-C59C53516AC5}.Release|x64.Build.0 = Release|x64 + {6E445F28-CA8F-430F-8CCF-C59C53516AC5}.Release|x86.ActiveCfg = Release|Win32 + {6E445F28-CA8F-430F-8CCF-C59C53516AC5}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {85A5962B-0218-472C-A361-6E55D8FE7E9B} + EndGlobalSection +EndGlobal diff --git a/src/win/msvc/vc16/VARCem.vcxproj b/src/win/msvc/vc16/VARCem.vcxproj new file mode 100644 index 0000000..099eef7 --- /dev/null +++ b/src/win/msvc/vc16/VARCem.vcxproj @@ -0,0 +1,793 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + _MSC_VER + _MSC_VER + + + + + Document + Generating Manifest file... + Generating Manifest file... + Generating Manifest file... + Generating Manifest file... + VARCem.manifest + VARCem.manifest + VARCem.manifest + VARCem.manifest + VARCem.rc + VARCem.rc + VARCem.rc + VARCem.rc + cl -nologo -EP %(FullPath) > $(SolutionDir)..\..\%(Outputs) + cl -nologo -EP %(FullPath) > $(SolutionDir)..\..\%(Outputs) + cl -nologo -EP %(FullPath) > $(SolutionDir)..\..\%(Outputs) + cl -nologo -EP %(FullPath) > $(SolutionDir)..\..\%(Outputs) + + + + 15.0 + {6E445F28-CA8F-430F-8CCF-C59C53516AC5} + Win32Proj + VARCem + 10.0 + + + + Application + true + v142 + NotSet + + + Application + false + v142 + true + NotSet + + + Application + true + v142 + NotSet + + + Application + false + v142 + true + NotSet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)\..\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) + false + + + true + $(ProjectDir)\..\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) + false + + + false + $(ProjectDir)\..\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) + false + + + false + $(ProjectDir)\..\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) + false + + + + NotUsing + Level3 + Disabled + true + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + DebugFull + winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;version.lib;%(AdditionalDependencies) + 5.01 + + + $(ProjectDir)\..\..\..\..\src;%(AdditionalIncludeDirectories) + SKIP_MANIFEST + + + + + NotUsing + Level3 + Disabled + true + _DEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + DebugFull + winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;version.lib;%(AdditionalDependencies) + 5.01 + + + $(ProjectDir)\..\..\..\..\src;%(AdditionalIncludeDirectories) + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + true + DebugFull + winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;version.lib;%(AdditionalDependencies) + 5.01 + + + $(ProjectDir)\..\..\..\..\src;%(AdditionalIncludeDirectories) + SKIP_MANIFEST + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + true + DebugFull + winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;version.lib;%(AdditionalDependencies) + 5.01 + + + $(ProjectDir)\..\..\..\..\src;%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/src/win/msvc/vc16/VARCem.vcxproj.filters b/src/win/msvc/vc16/VARCem.vcxproj.filters new file mode 100644 index 0000000..6ab342d --- /dev/null +++ b/src/win/msvc/vc16/VARCem.vcxproj.filters @@ -0,0 +1,1768 @@ + + + + + + + + + + + + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + + ui + + + ui + + + devices\cdrom + + + devices\cdrom + + + devices\cdrom + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\floppy\lzf + + + devices\floppy\lzf + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\input\game + + + devices\input\game + + + devices\input\game + + + devices\input\game + + + devices\input\game + + + devices\input + + + devices\input + + + devices\input + + + devices\input + + + devices\input + + + devices\input + + + devices\input + + + devices\network + + + devices\network + + + devices\network + + + devices\network + + + devices\ports + + + devices\ports + + + devices\ports + + + devices\ports + + + devices\ports + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\sio + + + devices\sio + + + devices\sio + + + devices\sio + + + devices\sio + + + devices\sio + + + devices\sio + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\munt\c_interface + + + devices\sound\munt\sha1 + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + devices\video + + + devices\misc + + + ui + + + + win + + + win + + + ui + + + win + + + devices\cdrom + + + devices\misc + + + devices\misc + + + devices\network + + + devices\network + + + devices\network + + + devices\printer + + + devices\printer + + + devices\printer + + + devices\video + + + devices\video + + + ui + + + ui + + + + ui + + + devices\network + + + devices\video + + + devices\scsi + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\floppy + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + devices\sound + + + + + + + + + + + + + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + win + + + win + + + + ui + + + ui + + + devices\cdrom + + + devices\cdrom + + + devices\cdrom + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\floppy\lzf + + + devices\floppy\lzf + + + devices\floppy\lzf + + + devices\floppy\lzf + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\input\game + + + devices\input + + + devices\input + + + devices\network + + + devices\network + + + devices\network + + + devices\ports + + + devices\ports + + + devices\ports + + + devices\ports + + + devices\ports + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\sio + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\munt\c_interface + + + devices\sound\munt\c_interface + + + devices\sound\munt\c_interface + + + devices\sound\munt\sha1 + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + machines + + + devices\misc + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + devices\misc + + + devices\misc + + + devices\network + + + devices\network + + + devices\network + + + devices\printer + + + devices\video + + + + devices\scsi + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\chipsets + + + devices\floppy + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + devices\sound + + + + + {7a5514af-a83b-483a-bfac-af1e20215c22} + + + {cb655d08-c712-4197-9eb8-2f5b7f49eed1} + + + {7cec753e-1e2c-4ebd-ba5b-e728767c949f} + + + {e97ddf22-9ad1-46da-bc17-bd998507adf8} + + + {33d139d2-8501-4ec5-adf5-30695fd66b58} + + + {0eb40b0a-0704-4966-b094-dc23e7fb1224} + + + {a9a86e4f-b4eb-4687-a979-f97b394db706} + + + {98d7b877-02b8-4c6b-b2b6-d2cc49f357bc} + + + {923338ef-338a-4592-9839-9f8587d93c52} + + + {fc7fc92b-b4da-4f3c-a5c7-4d2548b60fb2} + + + {7cae45b9-af45-4f82-9c53-a4e3094ddee4} + + + {b9d0388f-b14d-4448-85fe-7179fff3f77f} + + + {515f18e5-5eab-42f6-8364-37f02bc4f964} + + + {4fc4a59c-bb7c-45d7-a467-a06198e71472} + + + {2617b8d7-3afc-4f23-a0c8-936dab6c38b6} + + + {b28a24be-02cf-4896-9c96-aee25851df13} + + + {b8b30a24-da56-40f2-9a15-9c90ec2a98ed} + + + {144b7265-aa9e-453b-9855-78cd74ef9b76} + + + {309c083e-3028-4e46-a758-a8afeb95e914} + + + {4b343ed5-4818-4b62-beac-fcbc4185383f} + + + {99b35c64-342c-4f15-89b0-47c15f8db344} + + + {c21f8b49-308c-4e25-b69d-b03c1e24617a} + + + {51f1c4aa-4a2a-4639-bcbc-2075ffaf3e27} + + + {4797388a-1c9d-4a4c-a7f9-aa1925cad334} + + + {552b793b-68ef-4307-a736-304825db0e67} + + + + + win + + + + + win + + + \ No newline at end of file diff --git a/src/win/msvc/vc16/VARCem.vcxproj.user b/src/win/msvc/vc16/VARCem.vcxproj.user new file mode 100644 index 0000000..e0a0433 --- /dev/null +++ b/src/win/msvc/vc16/VARCem.vcxproj.user @@ -0,0 +1,19 @@ + + + + -L varcem.log + WindowsLocalDebugger + + + -L varcem.log + WindowsLocalDebugger + + + -L varcem.log + WindowsLocalDebugger + + + -L varcem.log + WindowsLocalDebugger + + \ No newline at end of file diff --git a/src/win/msvc/vc16/global.props b/src/win/msvc/vc16/global.props new file mode 100644 index 0000000..1c090df --- /dev/null +++ b/src/win/msvc/vc16/global.props @@ -0,0 +1,14 @@ + + + + + + $(ProjectDir)\..\Include;$(ProjectDir)\..\..\mingw\include;$(ProjectDir)\..\..\mingw\include\pcap;$(IncludePath) + + + + _USE_MATH_DEFINES;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_STDIO_ISO_WIDE_SPECIFIERS;USE_DYNAREC;USE_OPENAL;USE_SDL;USE_FLUIDSYNTH + + + + \ No newline at end of file diff --git a/src/win/msvc/vc16/localdirs.props b/src/win/msvc/vc16/localdirs.props new file mode 100644 index 0000000..8afc10e --- /dev/null +++ b/src/win/msvc/vc16/localdirs.props @@ -0,0 +1,11 @@ + + + + + + $(INCLUDE);$(IncludePath) + $(LIB32);$(LibraryPath) + + + + \ No newline at end of file From f6db5df4c762bf6cb9fad1f5f39b7d19ac7093e0 Mon Sep 17 00:00:00 2001 From: darkstar Date: Tue, 30 Apr 2019 14:36:16 +0200 Subject: [PATCH 2/3] Fix uninitialized variable in the D2D code --- src/win/win_d2d.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/win/win_d2d.cpp b/src/win/win_d2d.cpp index d56bffa..2144a00 100644 --- a/src/win/win_d2d.cpp +++ b/src/win/win_d2d.cpp @@ -8,7 +8,7 @@ * * Rendering module for Microsoft Direct2D. * - * Version: @(#)win_d2d.cpp 1.0.6 2019/04/29 + * Version: @(#)win_d2d.cpp 1.0.7 2019/04/29 * * Authors: Fred N. van Kempen, * David Hrdlicka, @@ -183,7 +183,7 @@ d2d_stretch(float *w, float *h, float *x, float *y) static void d2d_blit(bitmap_t *scr, int x, int y, int y1, int y2, int w, int h) { - ID2D1Bitmap *fs_bitmap; + ID2D1Bitmap *fs_bitmap = 0; ID2D1RenderTarget *RT; D2D1_RECT_U rectU; HRESULT hr = S_OK; From 9e91acdef34362b6689901a1e2b1fd1541504a57 Mon Sep 17 00:00:00 2001 From: darkstar Date: Tue, 30 Apr 2019 14:36:37 +0200 Subject: [PATCH 3/3] MSVC: Enable D3DX, D2D and MUNT --- src/win/msvc/vc16/VARCem.vcxproj | 2 ++ src/win/msvc/vc16/VARCem.vcxproj.filters | 6 ++++++ src/win/msvc/vc16/global.props | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/win/msvc/vc16/VARCem.vcxproj b/src/win/msvc/vc16/VARCem.vcxproj index 099eef7..61cd4e6 100644 --- a/src/win/msvc/vc16/VARCem.vcxproj +++ b/src/win/msvc/vc16/VARCem.vcxproj @@ -330,6 +330,7 @@ + @@ -583,6 +584,7 @@ + diff --git a/src/win/msvc/vc16/VARCem.vcxproj.filters b/src/win/msvc/vc16/VARCem.vcxproj.filters index 6ab342d..014e271 100644 --- a/src/win/msvc/vc16/VARCem.vcxproj.filters +++ b/src/win/msvc/vc16/VARCem.vcxproj.filters @@ -919,6 +919,9 @@ devices\sound + + win + @@ -1677,6 +1680,9 @@ devices\sound + + win + diff --git a/src/win/msvc/vc16/global.props b/src/win/msvc/vc16/global.props index 1c090df..a17d49a 100644 --- a/src/win/msvc/vc16/global.props +++ b/src/win/msvc/vc16/global.props @@ -7,7 +7,7 @@ - _USE_MATH_DEFINES;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_STDIO_ISO_WIDE_SPECIFIERS;USE_DYNAREC;USE_OPENAL;USE_SDL;USE_FLUIDSYNTH + _USE_MATH_DEFINES;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_STDIO_ISO_WIDE_SPECIFIERS;USE_DYNAREC;USE_OPENAL;USE_SDL;USE_FLUIDSYNTH;USE_MUNT;USE_D2D=2;USE_D3DX