From 2f8c9538d97a45fa3a65011734d41ca7ade98606 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 14 Jun 2020 12:57:08 -0700 Subject: [PATCH] Fixed libopenmptdecoder scaffolding and build on Windows. --- .../libopenmptdecoder.filters | 832 +---------------- .../libopenmptdecoder.vcxproj | 857 +++++------------- 2 files changed, 257 insertions(+), 1432 deletions(-) diff --git a/src/plugins/libopenmptdecoder/libopenmptdecoder.filters b/src/plugins/libopenmptdecoder/libopenmptdecoder.filters index aff98f6cc..0a22249ef 100644 --- a/src/plugins/libopenmptdecoder/libopenmptdecoder.filters +++ b/src/plugins/libopenmptdecoder/libopenmptdecoder.filters @@ -1,832 +1,22 @@  - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd;cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {0c34f22a-70bf-4fb8-b96c-f08cd406fd53} - - - {280eb342-9894-41b2-911f-0c5f93b0a856} - - - {f792f43e-8052-49cb-a377-d6a59ee84a6d} - - - {da658fc7-ef8f-40d1-bf27-f43b018a7a98} - - - {d193944b-dfc4-4e31-9b24-93230815c095} - - - {dbf2c887-734f-4a7b-b20e-da7a33b8451e} + + {7a89a1d3-bd14-40b2-b57f-cffad48da575} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - plugin\gme - - - plugin\gme - + + src + + + src + - - plugin + + src - - plugin - - - plugin - - - plugin - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme\higan\dsp - - - plugin\gme\higan\dsp - - - plugin\gme\higan\processor\spc700 - - - plugin\gme\higan\processor\spc700 - - - plugin\gme\higan\processor\spc700 - - - plugin\gme\higan\smp - - - - - plugin - - - plugin - - - plugin - - - plugin - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme - - - plugin\gme\higan\dsp - - - plugin\gme\higan\dsp - - - plugin\gme\higan\processor\spc700 - - - plugin\gme\higan\smp - - - plugin\gme\higan\smp - \ No newline at end of file diff --git a/src/plugins/libopenmptdecoder/libopenmptdecoder.vcxproj b/src/plugins/libopenmptdecoder/libopenmptdecoder.vcxproj index e688096a4..71bde2741 100644 --- a/src/plugins/libopenmptdecoder/libopenmptdecoder.vcxproj +++ b/src/plugins/libopenmptdecoder/libopenmptdecoder.vcxproj @@ -1,5 +1,5 @@  - + Debug-Con @@ -21,10 +21,6 @@ Debug Win32 - - Debug - x64 - Release-Con Win32 @@ -45,111 +41,105 @@ Release Win32 + + Debug + x64 + Release x64 - {89fd1021-21b5-44eb-bdbe-70381ade8522} - gmedecoder + {53bb539c-18f2-47ea-95e5-68a9591861f9} + ffmpegdecoder 10.0.17763.0 - - DynamicLibrary - v141 - Unicode - true - - - DynamicLibrary - v141 - Unicode - true - - - DynamicLibrary - v141 - Unicode - true - - - DynamicLibrary - v141 - Unicode - true - - - DynamicLibrary - v141 - Unicode - true - - - DynamicLibrary - v141 - Unicode - true - DynamicLibrary + true v141 Unicode - false DynamicLibrary + true v141 Unicode - false DynamicLibrary + true v141 Unicode - false + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + false + v141 + true + Unicode DynamicLibrary + true v141 Unicode - false DynamicLibrary + true v141 Unicode - false DynamicLibrary + true v141 Unicode - false + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + false + v141 + true + Unicode - - + - - - - - - - - - - - - - - - - + @@ -158,7 +148,16 @@ - + + + + + + + + + + @@ -167,682 +166,318 @@ + + + + + + + + + - - <_ProjectFileVersion>14.0.25123.0 - - - $(SolutionDir)/bin32/$(Configuration)/plugins/ - ./obj32/$(Configuration)/ - true - MinimumRecommendedRules.ruleset - - - - - $(SolutionDir)/bin32/$(Configuration)/plugins/ - ./obj32/$(Configuration)/ - true - MinimumRecommendedRules.ruleset - - - - - $(SolutionDir)/bin32/$(Configuration)/plugins/ - ./obj32/$(Configuration)/ - true - MinimumRecommendedRules.ruleset - - - - - true - MinimumRecommendedRules.ruleset - - - $(SolutionDir)/bin64/$(Configuration)/plugins/ - ./obj64/$(Configuration)/ - - - true - MinimumRecommendedRules.ruleset - - - $(SolutionDir)/bin64/$(Configuration)/plugins/ - ./obj64/$(Configuration)/ - - - true - MinimumRecommendedRules.ruleset - - - $(SolutionDir)/bin64/$(Configuration)/plugins/ - ./obj64/$(Configuration)/ - $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ - MinimumRecommendedRules.ruleset - - + + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ - MinimumRecommendedRules.ruleset - - + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ - MinimumRecommendedRules.ruleset - - + + + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ - MinimumRecommendedRules.ruleset - - $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ - MinimumRecommendedRules.ruleset - - $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ - MinimumRecommendedRules.ruleset - - + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ - Disabled - ../..;./gme/;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebug Level3 - EditAndContinue - $(IntDir) - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb + Disabled + true + ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug + 4996 - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - Windows - MachineX86 - false + ../../3rdparty/bin/win32/lib + libopenmpt.lib;%(AdditionalDependencies) + + + + - Disabled - ../..;./gme/;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebug Level3 - EditAndContinue - $(IntDir) - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb + Disabled + true + ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug + 4996 - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - Windows - MachineX86 - false + ../../3rdparty/bin/win32/lib + libopenmpt.lib;%(AdditionalDependencies) + + + + - Disabled - ../..;./gme/;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebug Level3 - EditAndContinue - $(IntDir) - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb + Disabled + true + ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug + 4996 - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - Windows - MachineX86 - false + ../../3rdparty/bin/win32/lib + libopenmpt.lib;%(AdditionalDependencies) + + + + - Disabled - ../..;./gme/;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebug Level3 - ProgramDatabase - $(IntDir) - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb + Disabled + false + ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - Windows - false + libopenmpt.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win64/lib - Disabled - ../..;./gme/;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebug Level3 - ProgramDatabase - $(IntDir) - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb + Disabled + false + ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - Windows - false + libopenmpt.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win64/lib - Disabled - ../..;./gme/;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebug Level3 - ProgramDatabase - $(IntDir) - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb + Disabled + false + ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - Windows - false + libopenmpt.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win64/lib - Default - true - ../..;./gme/;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 - - $(IntDir) - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb - Speed - true - true - MultiThreaded Full + true + true + true + ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + None + Default + Speed Sync + 4996 - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - Windows - true true - MachineX86 + true + ../../3rdparty/bin/win32/lib + libopenmpt.lib;%(AdditionalDependencies) false - false + Windows + false + + + + - Default - true - ../..;./gme/;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 - - - $(IntDir) - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb - Speed - true - true - MultiThreaded Full + true + true + true + ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + None + Default + Speed Sync + 4996 - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - Windows - true true - MachineX86 + true + ../../3rdparty/bin/win32/lib + libopenmpt.lib;%(AdditionalDependencies) false - false + Windows + false + + + + - Default - true - ../..;./gme/;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 - - - $(IntDir) - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb - Speed - true - true - MultiThreaded Full + true + true + true + ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + None + Default + Speed Sync + 4996 - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - Windows - true true - MachineX86 + true + ../../3rdparty/bin/win32/lib + libopenmpt.lib;%(AdditionalDependencies) false - false + Windows + false + + + + - Default - true - ../..;./gme/;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 - - - $(IntDir) - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb - Speed - true + MaxSpeed true + true + false + ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded - Full - Sync - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - Windows - true true - false - false + true + libopenmpt.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win64/lib - Default - true - ../..;./gme/;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 - - - $(IntDir) - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb - Speed - true + MaxSpeed true + true + false + ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded - Full - Sync - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - Windows - true true - false - false + true + libopenmpt.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win64/lib - Default - true - ../..;./gme/;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 - - - $(IntDir) - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb - Speed - true + MaxSpeed true + true + false + ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded - Full - Sync - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - Windows - true true - false - false + true + libopenmpt.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win64/lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +