Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[5077] trunk/OpenMPT
|
From: <man...@us...> - 2015-05-11 10:23:48
|
Revision: 5077
http://sourceforge.net/p/modplug/code/5077
Author: manxorist
Date: 2015-05-11 10:23:41 +0000 (Mon, 11 May 2015)
Log Message:
-----------
[Ref] build: Kill premake 4.3 and 4.4 support.
Modified Paths:
--------------
trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua
trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua
trunk/OpenMPT/build/premake4-win/mpt-foo_openmpt.premake4.lua
trunk/OpenMPT/build/premake4-win/premake.lua
trunk/OpenMPT/build/premake4-win/premake4-defaults-DLL.lua
trunk/OpenMPT/build/premake4-win/premake4-defaults-EXE.lua
trunk/OpenMPT/build/premake4-win/premake4-defaults-EXEGUI.lua
trunk/OpenMPT/build/premake4-win/premake4-defaults-LIB.lua
trunk/OpenMPT/build/premake4-win/premake4-defaults.lua
trunk/OpenMPT/build/regenerate_vs_projects.cmd
Property Changed:
----------------
trunk/OpenMPT/include/premake/
Modified: trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua 2015-05-11 10:11:30 UTC (rev 5076)
+++ trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua 2015-05-11 10:23:41 UTC (rev 5077)
@@ -78,19 +78,11 @@
}
buildoptions { "/wd4244", "/wd4267", "/wd4334" }
defines { "FLAC__NO_DLL", "FLAC__HAS_OGG=1" }
-if MPT_PREMAKE_VERSION == "5.0" then
filter { "action:vs2008" }
defines { "VERSION=\\\"1.3.1\\\"" }
filter { "action:not vs2008" }
defines { "VERSION=\"1.3.1\"" }
filter {}
-else
- configuration "vs2008"
- defines { "VERSION=\\\"1.3.1\\\"" }
- configuration "not vs2008"
- defines { "VERSION=\"1.3.1\"" }
- configuration "*"
-end
dofile "../../build/premake4-win/premake4-defaults-LIB.lua"
dofile "../../build/premake4-win/premake4-defaults.lua"
flags { "StaticRuntime" }
Modified: trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua 2015-05-11 10:11:30 UTC (rev 5076)
+++ trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua 2015-05-11 10:23:41 UTC (rev 5077)
@@ -69,15 +69,9 @@
"../../include/portaudio/include/portaudio.h",
}
buildoptions { "/wd4018", "/wd4267" }
-if MPT_PREMAKE_VERSION == "5.0" then
filter { "configurations:Debug" }
defines { "PA_ENABLE_DEBUG_OUTPUT" }
filter {}
-else
- configuration "Debug"
- defines { "PA_ENABLE_DEBUG_OUTPUT" }
- configuration "*"
-end
dofile "../../build/premake4-win/premake4-defaults-LIB.lua"
dofile "../../build/premake4-win/premake4-defaults.lua"
flags { "StaticRuntime" }
Modified: trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua 2015-05-11 10:11:30 UTC (rev 5076)
+++ trunk/OpenMPT/build/premake4-win/mpt-PluginBridge.premake4.lua 2015-05-11 10:23:41 UTC (rev 5077)
@@ -20,19 +20,11 @@
defines { "MODPLUG_TRACKER" }
flags { "SEH", "Unicode", "WinMain", "ExtraWarnings" }
prebuildcommands { "..\\..\\build\\svn_version\\update_svn_version_vs_premake.cmd $(IntDir)" }
-if MPT_PREMAKE_VERSION == "5.0" then
filter { "architecture:x86" }
targetsuffix "32"
filter { "architecture:x86_64" }
targetsuffix "64"
filter {}
-else
- configuration { "x32" }
- targetsuffix "32"
- configuration { "x64" }
- targetsuffix "64"
- configuration "*"
-end
dofile "../../build/premake4-win/premake4-defaults-EXEGUI.lua"
dofile "../../build/premake4-win/premake4-defaults.lua"
flags { "StaticRuntime" }
Modified: trunk/OpenMPT/build/premake4-win/mpt-foo_openmpt.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/mpt-foo_openmpt.premake4.lua 2015-05-11 10:11:30 UTC (rev 5076)
+++ trunk/OpenMPT/build/premake4-win/mpt-foo_openmpt.premake4.lua 2015-05-11 10:23:41 UTC (rev 5077)
@@ -1,5 +1,4 @@
-if MPT_PREMAKE_VERSION == "5.0" then
if _ACTION == "vs2010" then
project "foo_openmpt"
@@ -49,4 +48,3 @@
language "C++"
end
-end
Modified: trunk/OpenMPT/build/premake4-win/premake.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/premake.lua 2015-05-11 10:11:30 UTC (rev 5076)
+++ trunk/OpenMPT/build/premake4-win/premake.lua 2015-05-11 10:23:41 UTC (rev 5077)
@@ -6,14 +6,10 @@
MPT_PREMAKE_VERSION = ""
-if _PREMAKE_VERSION == "4.3" then
- MPT_PREMAKE_VERSION = "4.3"
-elseif _PREMAKE_VERSION == "4.4-beta5" then
- MPT_PREMAKE_VERSION = "4.4"
-elseif _PREMAKE_VERSION == "5.0-alpha3" then
+if _PREMAKE_VERSION == "5.0-alpha3" then
MPT_PREMAKE_VERSION = "5.0"
else
- print "Premake 4.3 or 4.4-beta5 or 5.0-alpha3 required"
+ print "Premake 5.0-alpha3 required"
os.exit(1)
end
@@ -56,21 +52,9 @@
outfile:close()
end
-function postprocess_vs2008_mfc (filename)
-if MPT_PREMAKE_VERSION == "4.3" then
- replace_in_file(filename, "UseOfMFC=\"2\"", "UseOfMFC=\"1\"")
-end
-end
-
function postprocess_vs2008_main (filename)
-if MPT_PREMAKE_VERSION == "4.3" then
replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "")
-elseif MPT_PREMAKE_VERSION == "4.4" then
- replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "")
-elseif MPT_PREMAKE_VERSION == "5.0" then
- replace_in_file(filename, "\t\t\t\tEntryPointSymbol=\"mainCRTStartup\"\n", "")
end
-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")
@@ -80,48 +64,18 @@
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)
-if MPT_PREMAKE_VERSION == "4.3" then
- replace_in_file(filename, "<UseOfMfc>Dynamic</UseOfMfc>", "<UseOfMfc>Static</UseOfMfc>")
-end
-end
-
function postprocess_vs2010_main (filename)
-if MPT_PREMAKE_VERSION == "4.3" then
replace_in_file(filename, "<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>", "")
-elseif MPT_PREMAKE_VERSION == "4.4" then
- replace_in_file(filename, "<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>", "")
-elseif MPT_PREMAKE_VERSION == "5.0" then
- replace_in_file(filename, "<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>", "")
end
-end
function postprocess_vs2010_nonxcompat (filename)
-if MPT_PREMAKE_VERSION == "4.3" then
- replace_in_file(filename, "\t\t</Link>\n", "\t\t\t<DataExecutionPrevention>false</DataExecutionPrevention>\n\t\t</Link>\n")
-elseif MPT_PREMAKE_VERSION == "4.4" then
replace_in_file(filename, " </Link>\n", " <DataExecutionPrevention>false</DataExecutionPrevention>\n </Link>\n")
-elseif MPT_PREMAKE_VERSION == "5.0" then
- replace_in_file(filename, " </Link>\n", " <DataExecutionPrevention>false</DataExecutionPrevention>\n </Link>\n")
end
-end
function postprocess_vs2010_largeaddress (filename)
-if MPT_PREMAKE_VERSION == "4.3" then
- replace_in_file(filename, "\t\t</Link>\n", "\t\t\t<LargeAddressAware>true</LargeAddressAware>\n\t\t</Link>\n")
-elseif MPT_PREMAKE_VERSION == "4.4" then
replace_in_file(filename, " </Link>\n", " <LargeAddressAware>true</LargeAddressAware>\n </Link>\n")
-elseif MPT_PREMAKE_VERSION == "5.0" then
- replace_in_file(filename, " </Link>\n", " <LargeAddressAware>true</LargeAddressAware>\n </Link>\n")
end
-end
-function fixbug_vs2010_pch (filename)
-if MPT_PREMAKE_VERSION == "4.3" then
- replace_in_file(filename, "</PrecompiledHeader>\n\t\t</ClCompile>", "</PrecompiledHeader>")
-end
-end
-
newaction {
trigger = "postprocess",
description = "OpenMPT postprocess the project files to mitigate premake problems",
@@ -131,7 +85,6 @@
postprocess_vs2008_main("build/vs2008/openmpt123.vcproj")
postprocess_vs2008_main("build/vs2008/libopenmpt_example_c.vcproj")
postprocess_vs2008_main("build/vs2008/libopenmpt_example_c_mem.vcproj")
- postprocess_vs2008_mfc("build/vs2008/OpenMPT.vcproj")
postprocess_vs2008_nonxcompat("build/vs2008/OpenMPT.vcproj")
postprocess_vs2008_largeaddress("build/vs2008/OpenMPT.vcproj")
postprocess_vs2008_nonxcompat("build/vs2008/PluginBridge.vcproj")
@@ -142,25 +95,16 @@
postprocess_vs2010_main("build/vs2010/libopenmpt_example_c.vcxproj")
postprocess_vs2010_main("build/vs2010/libopenmpt_example_c_mem.vcxproj")
postprocess_vs2010_main("build/vs2010/libopenmpt_example_cxx.vcxproj")
- postprocess_vs2010_mfc("build/vs2010/in_openmpt.vcxproj")
- postprocess_vs2010_mfc("build/vs2010/xmp-openmpt.vcxproj")
- postprocess_vs2010_mfc("build/vs2010/OpenMPT.vcxproj")
postprocess_vs2010_nonxcompat("build/vs2010/OpenMPT.vcxproj")
postprocess_vs2010_largeaddress("build/vs2010/OpenMPT.vcxproj")
postprocess_vs2010_nonxcompat("build/vs2010/PluginBridge.vcxproj")
postprocess_vs2010_largeaddress("build/vs2010/PluginBridge.vcxproj")
- fixbug_vs2010_pch("build/vs2010/OpenMPT.vcxproj")
-
-if MPT_PREMAKE_VERSION == "5.0" then
postprocess_vs2010_main("build/vs2012/libopenmpt_test.vcxproj")
postprocess_vs2010_main("build/vs2012/openmpt123.vcxproj")
postprocess_vs2010_main("build/vs2012/libopenmpt_example_c.vcxproj")
postprocess_vs2010_main("build/vs2012/libopenmpt_example_c_mem.vcxproj")
postprocess_vs2010_main("build/vs2012/libopenmpt_example_cxx.vcxproj")
- postprocess_vs2010_mfc("build/vs2012/in_openmpt.vcxproj")
- postprocess_vs2010_mfc("build/vs2012/xmp-openmpt.vcxproj")
- postprocess_vs2010_mfc("build/vs2012/OpenMPT.vcxproj")
postprocess_vs2010_nonxcompat("build/vs2012/OpenMPT.vcxproj")
postprocess_vs2010_largeaddress("build/vs2012/OpenMPT.vcxproj")
postprocess_vs2010_nonxcompat("build/vs2012/PluginBridge.vcxproj")
@@ -171,9 +115,6 @@
postprocess_vs2010_main("build/vs2013/libopenmpt_example_c.vcxproj")
postprocess_vs2010_main("build/vs2013/libopenmpt_example_c_mem.vcxproj")
postprocess_vs2010_main("build/vs2013/libopenmpt_example_cxx.vcxproj")
- postprocess_vs2010_mfc("build/vs2013/in_openmpt.vcxproj")
- postprocess_vs2010_mfc("build/vs2013/xmp-openmpt.vcxproj")
- postprocess_vs2010_mfc("build/vs2013/OpenMPT.vcxproj")
postprocess_vs2010_nonxcompat("build/vs2013/OpenMPT.vcxproj")
postprocess_vs2010_largeaddress("build/vs2013/OpenMPT.vcxproj")
postprocess_vs2010_nonxcompat("build/vs2013/PluginBridge.vcxproj")
@@ -184,16 +125,11 @@
postprocess_vs2010_main("build/vs2015/libopenmpt_example_c.vcxproj")
postprocess_vs2010_main("build/vs2015/libopenmpt_example_c_mem.vcxproj")
postprocess_vs2010_main("build/vs2015/libopenmpt_example_cxx.vcxproj")
- postprocess_vs2010_mfc("build/vs2015/in_openmpt.vcxproj")
- postprocess_vs2010_mfc("build/vs2015/xmp-openmpt.vcxproj")
- postprocess_vs2010_mfc("build/vs2015/OpenMPT.vcxproj")
postprocess_vs2010_nonxcompat("build/vs2015/OpenMPT.vcxproj")
postprocess_vs2010_largeaddress("build/vs2015/OpenMPT.vcxproj")
postprocess_vs2010_nonxcompat("build/vs2015/PluginBridge.vcxproj")
postprocess_vs2010_largeaddress("build/vs2015/PluginBridge.vcxproj")
-end
-
end
}
@@ -202,11 +138,7 @@
solution "libopenmpt-all"
location ( "../../build/" .. _ACTION )
configurations { "Debug", "Release" }
-if MPT_PREMAKE_VERSION == "5.0" then
platforms { "x86", "x86_64" }
-else
- platforms { "x32", "x64" }
-end
dofile "../../build/premake4-win/mpt-libopenmpt_test.premake4.lua"
dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua"
@@ -228,11 +160,7 @@
solution "libopenmpt_test"
location ( "../../build/" .. _ACTION )
configurations { "Debug", "Release" }
-if MPT_PREMAKE_VERSION == "5.0" then
platforms { "x86", "x86_64" }
-else
- platforms { "x32", "x64" }
-end
dofile "../../build/premake4-win/mpt-libopenmpt_test.premake4.lua"
dofile "../../build/premake4-win/ext-miniz.premake4.lua"
@@ -244,11 +172,7 @@
solution "foo_openmpt"
location ( "../../build/" .. _ACTION )
configurations { "Debug", "Release" }
-if MPT_PREMAKE_VERSION == "5.0" then
platforms { "x86" }
-else
- platforms { "x32" }
-end
dofile "../../build/premake4-win/mpt-foo_openmpt.premake4.lua"
dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua"
@@ -261,11 +185,7 @@
solution "in_openmpt"
location ( "../../build/" .. _ACTION )
configurations { "Debug", "Release" }
-if MPT_PREMAKE_VERSION == "5.0" then
platforms { "x86" }
-else
- platforms { "x32" }
-end
dofile "../../build/premake4-win/mpt-in_openmpt.premake4.lua"
dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua"
@@ -278,11 +198,7 @@
solution "xmp-openmpt"
location ( "../../build/" .. _ACTION )
configurations { "Debug", "Release" }
-if MPT_PREMAKE_VERSION == "5.0" then
platforms { "x86" }
-else
- platforms { "x32" }
-end
dofile "../../build/premake4-win/mpt-xmp-openmpt.premake4.lua"
dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua"
@@ -297,11 +213,7 @@
solution "libopenmpt"
location ( "../../build/" .. _ACTION )
configurations { "Debug", "Release" }
-if MPT_PREMAKE_VERSION == "5.0" then
platforms { "x86", "x86_64" }
-else
- platforms { "x32", "x64" }
-end
dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua"
dofile "../../build/premake4-win/mpt-libopenmpt_examples.premake4.lua"
@@ -318,11 +230,7 @@
solution "openmpt123"
location ( "../../build/" .. _ACTION )
configurations { "Debug", "Release" }
-if MPT_PREMAKE_VERSION == "5.0" then
platforms { "x86", "x86_64" }
-else
- platforms { "x32", "x64" }
-end
dofile "../../build/premake4-win/mpt-openmpt123.premake4.lua"
dofile "../../build/premake4-win/mpt-libopenmpt.premake4.lua"
@@ -338,11 +246,7 @@
solution "PluginBridge"
location ( "../../build/" .. _ACTION )
configurations { "Debug", "Release", "ReleaseNoLTCG" }
-if MPT_PREMAKE_VERSION == "5.0" then
platforms { "x86", "x86_64" }
-else
- platforms { "x32", "x64" }
-end
dofile "../../build/premake4-win/mpt-PluginBridge.premake4.lua"
@@ -354,11 +258,7 @@
solution "OpenMPT"
location ( "../../build/" .. _ACTION )
configurations { "Debug", "Release", "ReleaseNoLTCG" }
-if MPT_PREMAKE_VERSION == "5.0" then
platforms { "x86", "x86_64" }
-else
- platforms { "x32", "x64" }
-end
dofile "../../build/premake4-win/mpt-OpenMPT.premake4.lua"
dofile "../../build/premake4-win/mpt-PluginBridge.premake4.lua"
@@ -382,11 +282,7 @@
solution "all-externals"
location ( "../../build/" .. _ACTION .. "-ext" )
configurations { "Debug", "Release", "ReleaseNoLTCG" }
-if MPT_PREMAKE_VERSION == "5.0" then
platforms { "x86", "x86_64" }
-else
- platforms { "x32", "x64" }
-end
dofile "../../build/premake4-win/ext-flac.premake4.lua"
dofile "../../build/premake4-win/ext-lhasa.premake4.lua"
Modified: trunk/OpenMPT/build/premake4-win/premake4-defaults-DLL.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/premake4-defaults-DLL.lua 2015-05-11 10:11:30 UTC (rev 5076)
+++ trunk/OpenMPT/build/premake4-win/premake4-defaults-DLL.lua 2015-05-11 10:23:41 UTC (rev 5077)
@@ -1,30 +1,3 @@
-if MPT_PREMAKE_VERSION == "5.0" then
-
filter {}
kind "SharedLib"
-
-else
-
- configuration { "Debug", "x32" }
- targetdir "../../bin/Win32-Debug"
-
- configuration { "Release", "x32" }
- targetdir "../../bin/Win32"
-
- configuration { "ReleaseNoLTCG", "x32" }
- targetdir "../../bin/Win32"
-
- configuration { "Debug", "x64" }
- targetdir "../../bin/x64-Debug"
-
- configuration { "Release", "x64" }
- targetdir "../../bin/x64"
-
- configuration { "ReleaseNoLTCG", "x64" }
- targetdir "../../bin/x64"
-
- configuration "*"
- kind "SharedLib"
-
-end
Modified: trunk/OpenMPT/build/premake4-win/premake4-defaults-EXE.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/premake4-defaults-EXE.lua 2015-05-11 10:11:30 UTC (rev 5076)
+++ trunk/OpenMPT/build/premake4-win/premake4-defaults-EXE.lua 2015-05-11 10:23:41 UTC (rev 5077)
@@ -1,30 +1,3 @@
-if MPT_PREMAKE_VERSION == "5.0" then
-
filter {}
kind "ConsoleApp"
-
-else
-
- configuration { "Debug", "x32" }
- targetdir "../../bin/Win32-Debug"
-
- configuration { "Release", "x32" }
- targetdir "../../bin/Win32"
-
- configuration { "ReleaseNoLTCG", "x32" }
- targetdir "../../bin/Win32"
-
- configuration { "Debug", "x64" }
- targetdir "../../bin/x64-Debug"
-
- configuration { "Release", "x64" }
- targetdir "../../bin/x64"
-
- configuration { "ReleaseNoLTCG", "x64" }
- targetdir "../../bin/x64"
-
- configuration "*"
- kind "ConsoleApp"
-
-end
Modified: trunk/OpenMPT/build/premake4-win/premake4-defaults-EXEGUI.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/premake4-defaults-EXEGUI.lua 2015-05-11 10:11:30 UTC (rev 5076)
+++ trunk/OpenMPT/build/premake4-win/premake4-defaults-EXEGUI.lua 2015-05-11 10:23:41 UTC (rev 5077)
@@ -1,32 +1,4 @@
-if MPT_PREMAKE_VERSION == "5.0" then
-
filter {}
kind "WindowedApp"
flags { "WinMain" }
-
-else
-
- configuration { "Debug", "x32" }
- targetdir "../../bin/Win32-Debug"
-
- configuration { "Release", "x32" }
- targetdir "../../bin/Win32"
-
- configuration { "ReleaseNoLTCG", "x32" }
- targetdir "../../bin/Win32"
-
- configuration { "Debug", "x64" }
- targetdir "../../bin/x64-Debug"
-
- configuration { "Release", "x64" }
- targetdir "../../bin/x64"
-
- configuration { "ReleaseNoLTCG", "x64" }
- targetdir "../../bin/x64"
-
- configuration "*"
- kind "WindowedApp"
- flags { "WinMain" }
-
-end
Modified: trunk/OpenMPT/build/premake4-win/premake4-defaults-LIB.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/premake4-defaults-LIB.lua 2015-05-11 10:11:30 UTC (rev 5076)
+++ trunk/OpenMPT/build/premake4-win/premake4-defaults-LIB.lua 2015-05-11 10:23:41 UTC (rev 5077)
@@ -1,30 +1,3 @@
-if MPT_PREMAKE_VERSION == "5.0" then
-
filter {}
kind "StaticLib"
-
-else
-
- configuration { "Debug", "x32" }
- targetdir "../../build/lib/x32/Debug"
-
- configuration { "Release", "x32" }
- targetdir "../../build/lib/x32/Release"
-
- configuration { "ReleaseNoLTCG", "x32" }
- targetdir "../../build/lib/x32/ReleaseNoLTCG"
-
- configuration { "Debug", "x64" }
- targetdir "../../build/lib/x64/Debug"
-
- configuration { "Release", "x64" }
- targetdir "../../build/lib/x64/Release"
-
- configuration { "ReleaseNoLTCG", "x64" }
- targetdir "../../build/lib/x64/ReleaseNoLTCG"
-
- configuration "*"
- kind "StaticLib"
-
-end
Modified: trunk/OpenMPT/build/premake4-win/premake4-defaults.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/premake4-defaults.lua 2015-05-11 10:11:30 UTC (rev 5076)
+++ trunk/OpenMPT/build/premake4-win/premake4-defaults.lua 2015-05-11 10:23:41 UTC (rev 5077)
@@ -1,6 +1,4 @@
-if MPT_PREMAKE_VERSION == "5.0" then
-
filter {}
filter { "kind:StaticLib", "configurations:Debug", "architecture:x86" }
@@ -55,46 +53,3 @@
defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
filter {}
-
-else
-
- configuration "*"
-
- configuration "vs2008"
- includedirs { "../../include/msinttypes/stdint" }
-
- configuration "Debug"
- defines { "DEBUG" }
-if MPT_PREMAKE_VERSION == "4.3" then
- flags { "Symbols" }
-elseif MPT_PREMAKE_VERSION == "4.4" then
- flags { "Symbols" }
-end
-
- configuration "Release"
- defines { "NDEBUG" }
-if MPT_PREMAKE_VERSION == "4.3" then
- flags { "Symbols", "Optimize", "FloatFast" }
- buildoptions { "/MP" }
-elseif MPT_PREMAKE_VERSION == "4.4" then
- flags { "Symbols", "Optimize", "FloatFast" }
- buildoptions { "/GL /MP" }
- linkoptions { "/LTCG" }
-end
-
- configuration "ReleaseNoLTCG"
- defines { "NDEBUG" }
-if MPT_PREMAKE_VERSION == "4.3" then
- flags { "Optimize", "FloatFast" }
- buildoptions { "/GL- /MP" }
-elseif MPT_PREMAKE_VERSION == "4.4" then
- flags { "Optimize", "FloatFast" }
- buildoptions { "/MP" }
-end
-
- configuration "*"
- defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
-
- configuration "*"
-
-end
Modified: trunk/OpenMPT/build/regenerate_vs_projects.cmd
===================================================================
--- trunk/OpenMPT/build/regenerate_vs_projects.cmd 2015-05-11 10:11:30 UTC (rev 5076)
+++ trunk/OpenMPT/build/regenerate_vs_projects.cmd 2015-05-11 10:23:41 UTC (rev 5077)
@@ -6,38 +6,6 @@
cd .. || goto err
-goto premake5
-
-
-:premake4
-
-echo dofile "build/premake4-win/premake.lua" > premake4.lua || goto err
-
-include\premake\premake4.exe --group=libopenmpt_test vs2008 || goto err
-include\premake\premake4.exe --group=libopenmpt vs2008 || goto err
-include\premake\premake4.exe --group=openmpt123 vs2008 || goto err
-include\premake\premake4.exe --group=PluginBridge vs2008 || goto err
-include\premake\premake4.exe --group=OpenMPT vs2008 || goto err
-include\premake\premake4.exe --group=all-externals vs2008 || goto err
-
-include\premake\premake4.exe --group=libopenmpt_test vs2010 || goto err
-include\premake\premake4.exe --group=in_openmpt vs2010 || goto err
-include\premake\premake4.exe --group=xmp-openmpt vs2010 || goto err
-include\premake\premake4.exe --group=libopenmpt vs2010 || goto err
-include\premake\premake4.exe --group=openmpt123 vs2010 || goto err
-include\premake\premake4.exe --group=PluginBridge vs2010 || goto err
-include\premake\premake4.exe --group=OpenMPT vs2010 || goto err
-include\premake\premake4.exe --group=all-externals vs2010 || goto err
-
-include\premake\premake4.exe postprocess || goto err
-
-del premake4.lua || goto err
-
-goto premakedone
-
-
-:premake5
-
echo dofile "build/premake4-win/premake.lua" > premake5.lua || goto err
include\premake\premake5.exe --group=libopenmpt_test vs2008 || goto err
@@ -88,11 +56,7 @@
del premake5.lua || goto err
-goto premakedone
-
-:premakedone
-
cd %MY_DIR% || goto err
goto end
Index: trunk/OpenMPT/include/premake
===================================================================
--- trunk/OpenMPT/include/premake 2015-05-11 10:11:30 UTC (rev 5076)
+++ trunk/OpenMPT/include/premake 2015-05-11 10:23:41 UTC (rev 5077)
Property changes on: trunk/OpenMPT/include/premake
___________________________________________________________________
Modified: svn:ignore
## -1,2 +1 ##
-premake4.exe
premake5.exe
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
