Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[5053] trunk/OpenMPT
|
From: <man...@us...> - 2015-05-06 11:55:49
|
Revision: 5053
http://sourceforge.net/p/modplug/code/5053
Author: manxorist
Date: 2015-05-06 11:55:42 +0000 (Wed, 06 May 2015)
Log Message:
-----------
[Fix] build: Make premake VS2008 OpenMPT projects compile properly.
[Fix] MIDI I/O Plugin: #define nullptr in order to make it build with VS2008.
Modified Paths:
--------------
trunk/OpenMPT/build/premake4-win/mpt-OpenMPT.premake4.lua
trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua
trunk/OpenMPT/build/premake4.lua
trunk/OpenMPT/build/vs2008/OpenMPT.vcproj
trunk/OpenMPT/build/vs2008/PluginBridge.vcproj
trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj
trunk/OpenMPT/plugins/MidiInOut/MidiInOut.cpp
trunk/OpenMPT/plugins/MidiInOut/MidiInOut.h
trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.cpp
trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.h
Modified: trunk/OpenMPT/build/premake4-win/mpt-OpenMPT.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/mpt-OpenMPT.premake4.lua 2015-05-06 09:55:35 UTC (rev 5052)
+++ trunk/OpenMPT/build/premake4-win/mpt-OpenMPT.premake4.lua 2015-05-06 11:55:42 UTC (rev 5053)
@@ -61,6 +61,8 @@
"/DELAYLOAD:OpenMPT_SoundTouch_f32.dll",
}
prebuildcommands { "..\\..\\build\\svn_version\\update_svn_version_vs_premake.cmd $(IntDir)" }
+ configuration "vs2008"
+ includedirs { "../../include/msinttypes/stdint" }
dofile "../../build/premake4-win/premake4-defaults-EXEGUI.lua"
dofile "../../build/premake4-win/premake4-defaults-static.lua"
@@ -97,5 +99,7 @@
"winmm",
}
prebuildcommands { "..\\..\\build\\svn_version\\update_svn_version_vs_premake.cmd $(IntDir)" }
+ configuration "vs2008"
+ includedirs { "../../include/msinttypes/stdint" }
dofile "../../build/premake4-win/premake4-defaults-DLL.lua"
dofile "../../build/premake4-win/premake4-defaults-static.lua"
Modified: trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua 2015-05-06 09:55:35 UTC (rev 5052)
+++ trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua 2015-05-06 11:55:42 UTC (rev 5053)
@@ -24,6 +24,8 @@
targetsuffix "32"
configuration { "x64" }
targetsuffix "64"
+ configuration "vs2008"
+ includedirs { "../../include/msinttypes/stdint" }
dofile "../../build/premake4-win/premake4-defaults-EXEGUI.lua"
dofile "../../build/premake4-win/premake4-defaults-static.lua"
Modified: trunk/OpenMPT/build/premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4.lua 2015-05-06 09:55:35 UTC (rev 5052)
+++ trunk/OpenMPT/build/premake4.lua 2015-05-06 11:55:42 UTC (rev 5053)
@@ -42,6 +42,18 @@
replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "")
end
+function postprocess_vs2008_dynamicbase (filename)
+ replace_in_file(filename, "\t\t\t\tEnableCOMDATFolding=\"2\"", "\t\t\t\tEnableCOMDATFolding=\"2\"\n\t\t\t\tRandomizedBaseAddress=\"2\"")
+end
+
+function postprocess_vs2008_nonxcompat (filename)
+ replace_in_file(filename, "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n", "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n\t\t\t\t\DataExecutionPrevention=\"1\"\n")
+end
+
+function postprocess_vs2008_largeaddress (filename)
+ replace_in_file(filename, "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n", "\t\t\t<Tool\n\t\t\t\tName=\"VCLinkerTool\"\n\t\t\t\t\LargeAddressAware=\"2\"\n")
+end
+
function postprocess_vs2010_mfc (filename)
replace_in_file(filename, "<UseOfMfc>Dynamic</UseOfMfc>", "<UseOfMfc>Static</UseOfMfc>")
end
@@ -72,10 +84,16 @@
execute = function ()
postprocess_vs2008_main("build/vs2008/libopenmpt_test.vcproj")
postprocess_vs2008_main("build/vs2008/openmpt123.vcproj")
+ postprocess_vs2008_mfc("build/vs2008/OpenMPT.vcproj")
+ postprocess_vs2008_dynamicbase("build/vs2008/OpenMPT.vcproj")
+ postprocess_vs2008_nonxcompat("build/vs2008/OpenMPT.vcproj")
+ postprocess_vs2008_largeaddress("build/vs2008/OpenMPT.vcproj")
+ postprocess_vs2008_dynamicbase("build/vs2008/PluginBridge.vcproj")
+ postprocess_vs2008_nonxcompat("build/vs2008/PluginBridge.vcproj")
+ postprocess_vs2008_largeaddress("build/vs2008/PluginBridge.vcproj")
postprocess_vs2010_main("build/vs2010/libopenmpt_test.vcxproj")
postprocess_vs2010_main("build/vs2010/openmpt123.vcxproj")
postprocess_vs2010_main("build/vs2010/OpenMPT.vcxproj")
- postprocess_vs2008_mfc("build/vs2008/OpenMPT.vcproj")
postprocess_vs2010_mfc("build/vs2010/in_openmpt.vcxproj")
postprocess_vs2010_mfc("build/vs2010/xmp-openmpt.vcxproj")
postprocess_vs2010_mfc("build/vs2010/OpenMPT.vcxproj")
Modified: trunk/OpenMPT/build/vs2008/OpenMPT.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-06 09:55:35 UTC (rev 5052)
+++ trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-05-06 11:55:42 UTC (rev 5053)
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -64,13 +64,15 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ LargeAddressAware="2"
+ DataExecutionPrevention="1"
AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll"
AdditionalDependencies="..\lib\x32\Debug\UnRAR.lib ..\lib\x32\Debug\zlib.lib ..\lib\x32\Debug\minizip.lib ..\lib\x32\Debug\smbPitchShift.lib ..\lib\x32\Debug\lhasa.lib ..\lib\x32\Debug\flac.lib ..\lib\x32\Debug\ogg.lib ..\lib\x32\Debug\portaudio.lib ..\lib\x32\Debug\r8brain.lib ..\..\bin\Win32-Debug\OpenMPT_SoundTouch_f32.lib"
OutputFile="$(OutDir)\OpenMPT.exe"
@@ -134,7 +136,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -153,13 +155,15 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ LargeAddressAware="2"
+ DataExecutionPrevention="1"
AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll"
AdditionalDependencies="..\lib\x64\Debug\UnRAR.lib ..\lib\x64\Debug\zlib.lib ..\lib\x64\Debug\minizip.lib ..\lib\x64\Debug\smbPitchShift.lib ..\lib\x64\Debug\lhasa.lib ..\lib\x64\Debug\flac.lib ..\lib\x64\Debug\ogg.lib ..\lib\x64\Debug\portaudio.lib ..\lib\x64\Debug\r8brain.lib ..\..\bin\x64-Debug\OpenMPT_SoundTouch_f32.lib"
OutputFile="$(OutDir)\OpenMPT.exe"
@@ -223,7 +227,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
ExceptionHandling="2"
StringPooling="true"
@@ -242,13 +246,15 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ LargeAddressAware="2"
+ DataExecutionPrevention="1"
AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll"
AdditionalDependencies="..\lib\x32\Release\UnRAR.lib ..\lib\x32\Release\zlib.lib ..\lib\x32\Release\minizip.lib ..\lib\x32\Release\smbPitchShift.lib ..\lib\x32\Release\lhasa.lib ..\lib\x32\Release\flac.lib ..\lib\x32\Release\ogg.lib ..\lib\x32\Release\portaudio.lib ..\lib\x32\Release\r8brain.lib ..\..\bin\Win32\OpenMPT_SoundTouch_f32.lib"
OutputFile="$(OutDir)\OpenMPT.exe"
@@ -259,6 +265,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="2"
TargetMachine="1"
/>
<Tool
@@ -315,7 +322,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
ExceptionHandling="2"
StringPooling="true"
@@ -334,13 +341,15 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ LargeAddressAware="2"
+ DataExecutionPrevention="1"
AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll"
AdditionalDependencies="..\lib\x64\Release\UnRAR.lib ..\lib\x64\Release\zlib.lib ..\lib\x64\Release\minizip.lib ..\lib\x64\Release\smbPitchShift.lib ..\lib\x64\Release\lhasa.lib ..\lib\x64\Release\flac.lib ..\lib\x64\Release\ogg.lib ..\lib\x64\Release\portaudio.lib ..\lib\x64\Release\r8brain.lib ..\..\bin\x64\OpenMPT_SoundTouch_f32.lib"
OutputFile="$(OutDir)\OpenMPT.exe"
@@ -351,6 +360,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="2"
TargetMachine="17"
/>
<Tool
@@ -406,7 +416,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/GL- /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
ExceptionHandling="2"
StringPooling="true"
@@ -425,13 +435,15 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ LargeAddressAware="2"
+ DataExecutionPrevention="1"
AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll"
AdditionalDependencies="..\lib\x32\ReleaseNoLTCG\UnRAR.lib ..\lib\x32\ReleaseNoLTCG\zlib.lib ..\lib\x32\ReleaseNoLTCG\minizip.lib ..\lib\x32\ReleaseNoLTCG\smbPitchShift.lib ..\lib\x32\ReleaseNoLTCG\lhasa.lib ..\lib\x32\ReleaseNoLTCG\flac.lib ..\lib\x32\ReleaseNoLTCG\ogg.lib ..\lib\x32\ReleaseNoLTCG\portaudio.lib ..\lib\x32\ReleaseNoLTCG\r8brain.lib ..\..\bin\Win32\OpenMPT_SoundTouch_f32.lib"
OutputFile="$(OutDir)\OpenMPT.exe"
@@ -441,6 +453,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="2"
TargetMachine="1"
/>
<Tool
@@ -497,7 +510,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/GL- /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
ExceptionHandling="2"
StringPooling="true"
@@ -516,13 +529,15 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\..\soundlib;..\..\include;..\..\include\msinttypes\inttypes;..\..\include\vstsdk2.4;..\..\include\ASIOSDK2\common;..\..\include\lhasa\lib\public;..\..\include\ogg\include;..\..\include\zlib;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ LargeAddressAware="2"
+ DataExecutionPrevention="1"
AdditionalOptions="/DELAYLOAD:OpenMPT_SoundTouch_f32.dll"
AdditionalDependencies="..\lib\x64\ReleaseNoLTCG\UnRAR.lib ..\lib\x64\ReleaseNoLTCG\zlib.lib ..\lib\x64\ReleaseNoLTCG\minizip.lib ..\lib\x64\ReleaseNoLTCG\smbPitchShift.lib ..\lib\x64\ReleaseNoLTCG\lhasa.lib ..\lib\x64\ReleaseNoLTCG\flac.lib ..\lib\x64\ReleaseNoLTCG\ogg.lib ..\lib\x64\ReleaseNoLTCG\portaudio.lib ..\lib\x64\ReleaseNoLTCG\r8brain.lib ..\..\bin\x64\OpenMPT_SoundTouch_f32.lib"
OutputFile="$(OutDir)\OpenMPT.exe"
@@ -532,6 +547,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="2"
TargetMachine="17"
/>
<Tool
Modified: trunk/OpenMPT/build/vs2008/PluginBridge.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/PluginBridge.vcproj 2015-05-06 09:55:35 UTC (rev 5052)
+++ trunk/OpenMPT/build/vs2008/PluginBridge.vcproj 2015-05-06 11:55:42 UTC (rev 5053)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -62,13 +62,15 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ LargeAddressAware="2"
+ DataExecutionPrevention="1"
OutputFile="$(OutDir)\PluginBridge32.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""
@@ -129,7 +131,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -147,13 +149,15 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="MODPLUG_TRACKER;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ LargeAddressAware="2"
+ DataExecutionPrevention="1"
OutputFile="$(OutDir)\PluginBridge64.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""
@@ -214,7 +218,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
ExceptionHandling="2"
StringPooling="true"
@@ -232,13 +236,15 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ LargeAddressAware="2"
+ DataExecutionPrevention="1"
OutputFile="$(OutDir)\PluginBridge32.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@@ -247,6 +253,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="2"
TargetMachine="1"
/>
<Tool
@@ -302,7 +309,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
ExceptionHandling="2"
StringPooling="true"
@@ -320,13 +327,15 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ LargeAddressAware="2"
+ DataExecutionPrevention="1"
OutputFile="$(OutDir)\PluginBridge64.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@@ -335,6 +344,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="2"
TargetMachine="17"
/>
<Tool
@@ -389,7 +399,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/GL- /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
ExceptionHandling="2"
StringPooling="true"
@@ -407,13 +417,15 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ LargeAddressAware="2"
+ DataExecutionPrevention="1"
OutputFile="$(OutDir)\PluginBridge32.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@@ -421,6 +433,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="2"
TargetMachine="1"
/>
<Tool
@@ -476,7 +489,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/GL- /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
ExceptionHandling="2"
StringPooling="true"
@@ -494,13 +507,15 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="MODPLUG_TRACKER;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version"
+ AdditionalIncludeDirectories="..\..\common;..\include\vstsdk2.4;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ LargeAddressAware="2"
+ DataExecutionPrevention="1"
OutputFile="$(OutDir)\PluginBridge64.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@@ -508,6 +523,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="2"
TargetMachine="17"
/>
<Tool
Modified: trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj 2015-05-06 09:55:35 UTC (rev 5052)
+++ trunk/OpenMPT/build/vs2008/VST MIDI Input Output.vcproj 2015-05-06 11:55:42 UTC (rev 5053)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include"
+ AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -61,7 +61,7 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include"
+ AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -130,7 +130,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include"
+ AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -147,7 +147,7 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include"
+ AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -216,7 +216,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include"
+ AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
@@ -233,7 +233,7 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include"
+ AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -305,7 +305,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include"
+ AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
@@ -322,7 +322,7 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include"
+ AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -393,7 +393,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/GL- /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include"
+ AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
@@ -410,7 +410,7 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include"
+ AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -481,7 +481,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/GL- /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include"
+ AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint"
PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
@@ -498,7 +498,7 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include"
+ AdditionalIncludeDirectories="..\..\include\vstsdk2.4;..\..\include;..\..\include\msinttypes\stdint"
/>
<Tool
Name="VCPreLinkEventTool"
Modified: trunk/OpenMPT/plugins/MidiInOut/MidiInOut.cpp
===================================================================
--- trunk/OpenMPT/plugins/MidiInOut/MidiInOut.cpp 2015-05-06 09:55:35 UTC (rev 5052)
+++ trunk/OpenMPT/plugins/MidiInOut/MidiInOut.cpp 2015-05-06 11:55:42 UTC (rev 5053)
@@ -7,6 +7,17 @@
* The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
+#define MODPLUG_TRACKER
+#define OPENMPT_NAMESPACE
+#define OPENMPT_NAMESPACE_BEGIN
+#define OPENMPT_NAMESPACE_END
+#define VC_EXTRALEAN
+#define NOMINMAX
+#ifdef _MSC_VER
+#if (_MSC_VER < 1600)
+#define nullptr 0
+#endif
+#endif
#include "MidiInOut.h"
#include "MidiInOutEditor.h"
Modified: trunk/OpenMPT/plugins/MidiInOut/MidiInOut.h
===================================================================
--- trunk/OpenMPT/plugins/MidiInOut/MidiInOut.h 2015-05-06 09:55:35 UTC (rev 5052)
+++ trunk/OpenMPT/plugins/MidiInOut/MidiInOut.h 2015-05-06 11:55:42 UTC (rev 5053)
@@ -10,10 +10,6 @@
#pragma once
-#define MODPLUG_TRACKER
-#define OPENMPT_NAMESPACE
-#define OPENMPT_NAMESPACE_BEGIN
-#define OPENMPT_NAMESPACE_END
#include "../common/mutex.h"
#include <vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.h>
#include <portmidi/pm_common/portmidi.h>
Modified: trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.cpp
===================================================================
--- trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.cpp 2015-05-06 09:55:35 UTC (rev 5052)
+++ trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.cpp 2015-05-06 11:55:42 UTC (rev 5053)
@@ -7,11 +7,20 @@
* The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
+#define MODPLUG_TRACKER
+#define OPENMPT_NAMESPACE
+#define OPENMPT_NAMESPACE_BEGIN
+#define OPENMPT_NAMESPACE_END
+#define VC_EXTRALEAN
+#define NOMINMAX
+#ifdef _MSC_VER
+#if (_MSC_VER < 1600)
+#define nullptr 0
+#endif
+#endif
#include "MidiInOutEditor.h"
#include "MidiInOut.h"
-#define VC_EXTRALEAN
-#define NOMINMAX
#include "windows.h"
Modified: trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.h
===================================================================
--- trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.h 2015-05-06 09:55:35 UTC (rev 5052)
+++ trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.h 2015-05-06 11:55:42 UTC (rev 5053)
@@ -10,10 +10,6 @@
#pragma once
-#define MODPLUG_TRACKER
-#define OPENMPT_NAMESPACE
-#define OPENMPT_NAMESPACE_BEGIN
-#define OPENMPT_NAMESPACE_END
#include <vstsdk2.4/public.sdk/source/vst2.x/aeffeditor.h>
#include <portmidi/pm_common/portmidi.h>
#include "../common/Window.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
