diff --git a/.gitignore b/.gitignore index 81a4da74..54e1a978 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,6 @@ stamp-h1 # Other compile + +# Visual Studio +.vs diff --git a/src/libs/zmbv/.gitignore b/src/libs/zmbv/.gitignore index 4658efe3..80cfb521 100644 --- a/src/libs/zmbv/.gitignore +++ b/src/libs/zmbv/.gitignore @@ -1,5 +1,11 @@ +# Visual Studio +.vs +Debug +Release +*.vcxproj.filters +*.vcxproj.user + # svn:ignore .deps Makefile -Makefile.in - +Makefile.in \ No newline at end of file diff --git a/src/libs/zmbv/drvproc.cpp b/src/libs/zmbv/drvproc.cpp index 299e5e67..708296b6 100644 --- a/src/libs/zmbv/drvproc.cpp +++ b/src/libs/zmbv/drvproc.cpp @@ -68,7 +68,7 @@ * Defined separately for each message. * ***************************************************************************/ -extern "C" LRESULT PASCAL __declspec(dllexport) DriverProc(DWORD dwDriverID, HDRVR hDriver, UINT uiMessage, LPARAM lParam1, LPARAM lParam2) { +extern "C" LRESULT __declspec(dllexport) PASCAL DriverProc(DWORD dwDriverID, HDRVR hDriver, UINT uiMessage, LPARAM lParam1, LPARAM lParam2) { CodecInst* pi = (CodecInst*)dwDriverID; switch (uiMessage) { diff --git a/src/libs/zmbv/zmbv.sln b/src/libs/zmbv/zmbv.sln index aea19d7c..a74851c4 100644 --- a/src/libs/zmbv/zmbv.sln +++ b/src/libs/zmbv/zmbv.sln @@ -1,21 +1,24 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zmbv", "zmbv.vcproj", "{619CF3F9-C373-4BD5-93DA-025F5E16F8FA}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29324.140 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zmbv", "zmbv.vcxproj", "{619CF3F9-C373-4BD5-93DA-025F5E16F8FA}" EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {619CF3F9-C373-4BD5-93DA-025F5E16F8FA}.Debug.ActiveCfg = Debug|Win32 - {619CF3F9-C373-4BD5-93DA-025F5E16F8FA}.Debug.Build.0 = Debug|Win32 - {619CF3F9-C373-4BD5-93DA-025F5E16F8FA}.Release.ActiveCfg = Release|Win32 - {619CF3F9-C373-4BD5-93DA-025F5E16F8FA}.Release.Build.0 = Release|Win32 + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {619CF3F9-C373-4BD5-93DA-025F5E16F8FA}.Debug|x86.ActiveCfg = Debug|Win32 + {619CF3F9-C373-4BD5-93DA-025F5E16F8FA}.Debug|x86.Build.0 = Debug|Win32 + {619CF3F9-C373-4BD5-93DA-025F5E16F8FA}.Release|x86.ActiveCfg = Release|Win32 + {619CF3F9-C373-4BD5-93DA-025F5E16F8FA}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + SolutionGuid = {4F2872F5-302B-4AD7-A173-E3E0E2D750FB} EndGlobalSection EndGlobal diff --git a/src/libs/zmbv/zmbv.vcproj b/src/libs/zmbv/zmbv.vcproj deleted file mode 100644 index ce973b86..00000000 --- a/src/libs/zmbv/zmbv.vcproj +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/libs/zmbv/zmbv.vcxproj b/src/libs/zmbv/zmbv.vcxproj new file mode 100644 index 00000000..c4fbf50a --- /dev/null +++ b/src/libs/zmbv/zmbv.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {619CF3F9-C373-4BD5-93DA-025F5E16F8FA} + Win32Proj + + + + DynamicLibrary + v142 + MultiByte + + + DynamicLibrary + v142 + MultiByte + + + + + + + + + + + + + <_ProjectFileVersion>16.0.29311.71 + + + Debug\ + Debug\ + true + MinimumRecommendedRules.ruleset + + + + + Release\ + Release\ + false + MinimumRecommendedRules.ruleset + + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + + Level3 + EditAndContinue + + + winmm.lib;odbc32.lib;odbccp32.lib;zlibd.lib;%(AdditionalDependencies) + $(OutDir)zmbv.dll + zmbv.def + true + $(OutDir)zmbv.pdb + Windows + MachineX86 + false + + + + + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + winmm.lib;odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir)zmbv.dll + zmbv.def + true + true + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file