Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3323] trunk/OpenMPT
|
From: <man...@us...> - 2013-11-27 01:53:01
|
Revision: 3323
http://sourceforge.net/p/modplug/code/3323
Author: manxorist
Date: 2013-11-27 01:52:51 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
[Int] Prepare premake4 files to support building libopenmpt via premake.
Modified Paths:
--------------
trunk/OpenMPT/build/premake4-defaults-DLL.lua
trunk/OpenMPT/build/premake4-defaults-EXE.lua
trunk/OpenMPT/build/premake4-defaults-LIB.lua
trunk/OpenMPT/build/update_premake4_projects.cmd
trunk/OpenMPT/include/premake4.lua
Added Paths:
-----------
trunk/OpenMPT/build/premake4-defaults-shared.lua
trunk/OpenMPT/build/premake4-defaults-static.lua
trunk/OpenMPT/build/premake4.lua
Removed Paths:
-------------
trunk/OpenMPT/build/premake4-defaults.lua
Property Changed:
----------------
trunk/OpenMPT/build/
Index: trunk/OpenMPT/build
===================================================================
--- trunk/OpenMPT/build 2013-11-27 01:04:51 UTC (rev 3322)
+++ trunk/OpenMPT/build 2013-11-27 01:52:51 UTC (rev 3323)
Property changes on: trunk/OpenMPT/build
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,4 ##
lib
obj
premake4.exe
+all.sln
Modified: trunk/OpenMPT/build/premake4-defaults-DLL.lua
===================================================================
--- trunk/OpenMPT/build/premake4-defaults-DLL.lua 2013-11-27 01:04:51 UTC (rev 3322)
+++ trunk/OpenMPT/build/premake4-defaults-DLL.lua 2013-11-27 01:52:51 UTC (rev 3323)
@@ -19,5 +19,3 @@
configuration "*"
kind "SharedLib"
-
- dofile "premake4-defaults.lua"
Modified: trunk/OpenMPT/build/premake4-defaults-EXE.lua
===================================================================
--- trunk/OpenMPT/build/premake4-defaults-EXE.lua 2013-11-27 01:04:51 UTC (rev 3322)
+++ trunk/OpenMPT/build/premake4-defaults-EXE.lua 2013-11-27 01:52:51 UTC (rev 3323)
@@ -19,5 +19,3 @@
configuration "*"
kind "ConsoleApp"
-
- dofile "premake4-defaults.lua"
Modified: trunk/OpenMPT/build/premake4-defaults-LIB.lua
===================================================================
--- trunk/OpenMPT/build/premake4-defaults-LIB.lua 2013-11-27 01:04:51 UTC (rev 3322)
+++ trunk/OpenMPT/build/premake4-defaults-LIB.lua 2013-11-27 01:52:51 UTC (rev 3323)
@@ -19,5 +19,3 @@
configuration "*"
kind "StaticLib"
-
- dofile "premake4-defaults.lua"
Added: trunk/OpenMPT/build/premake4-defaults-shared.lua
===================================================================
--- trunk/OpenMPT/build/premake4-defaults-shared.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-defaults-shared.lua 2013-11-27 01:52:51 UTC (rev 3323)
@@ -0,0 +1,17 @@
+
+ configuration "Debug"
+ defines { "DEBUG" }
+ defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
+ flags { "Symbols" }
+
+ configuration "Release"
+ defines { "NDEBUG" }
+ defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
+ flags { "Symbols", "Optimize", "FloatFast" }
+ buildoptions { "/MP" }
+
+ configuration "ReleaseNoLTCG"
+ defines { "NDEBUG" }
+ defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
+ flags { "Optimize", "FloatFast" }
+ buildoptions { "/GL- /MP" }
Copied: trunk/OpenMPT/build/premake4-defaults-static.lua (from rev 3321, trunk/OpenMPT/build/premake4-defaults.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-defaults-static.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-defaults-static.lua 2013-11-27 01:52:51 UTC (rev 3323)
@@ -0,0 +1,17 @@
+
+ configuration "Debug"
+ defines { "DEBUG" }
+ defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
+ flags { "Symbols" }
+
+ configuration "Release"
+ defines { "NDEBUG" }
+ defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
+ flags { "Symbols", "Optimize", "FloatFast", "StaticRuntime" }
+ buildoptions { "/MP" }
+
+ configuration "ReleaseNoLTCG"
+ defines { "NDEBUG" }
+ defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
+ flags { "Optimize", "FloatFast", "StaticRuntime" }
+ buildoptions { "/GL- /MP" }
Deleted: trunk/OpenMPT/build/premake4-defaults.lua
===================================================================
--- trunk/OpenMPT/build/premake4-defaults.lua 2013-11-27 01:04:51 UTC (rev 3322)
+++ trunk/OpenMPT/build/premake4-defaults.lua 2013-11-27 01:52:51 UTC (rev 3323)
@@ -1,17 +0,0 @@
-
- configuration "Debug"
- defines { "DEBUG" }
- defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
- flags { "Symbols" }
-
- configuration "Release"
- defines { "NDEBUG" }
- defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
- flags { "Symbols", "Optimize", "FloatFast", "StaticRuntime" }
- buildoptions { "/MP" }
-
- configuration "ReleaseNoLTCG"
- defines { "NDEBUG" }
- defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
- flags { "Optimize", "FloatFast", "StaticRuntime" }
- buildoptions { "/GL- /MP" }
Added: trunk/OpenMPT/build/premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4.lua 2013-11-27 01:52:51 UTC (rev 3323)
@@ -0,0 +1,6 @@
+
+solution "all"
+ configurations { "Debug", "Release", "ReleaseNoLTCG" }
+ platforms { "x32", "x64" }
+
+ dofile "../include/premake4.lua"
Modified: trunk/OpenMPT/build/update_premake4_projects.cmd
===================================================================
--- trunk/OpenMPT/build/update_premake4_projects.cmd 2013-11-27 01:04:51 UTC (rev 3322)
+++ trunk/OpenMPT/build/update_premake4_projects.cmd 2013-11-27 01:52:51 UTC (rev 3323)
@@ -5,10 +5,10 @@
cd build
cd .. || goto err
-echo dofile "include/premake4.lua" > premake4.lua || goto err
+echo dofile "build/premake4.lua" > premake4.lua || goto err
+build\premake4.exe vs2008 || goto err
build\premake4.exe vs2010 || goto err
-build\premake4.exe vs2008 || goto err
del premake4.lua || goto err
Modified: trunk/OpenMPT/include/premake4.lua
===================================================================
--- trunk/OpenMPT/include/premake4.lua 2013-11-27 01:04:51 UTC (rev 3322)
+++ trunk/OpenMPT/include/premake4.lua 2013-11-27 01:52:51 UTC (rev 3323)
@@ -1,9 +1,4 @@
-solution "include"
- configurations { "Debug", "Release", "ReleaseNoLTCG" }
- platforms { "x32", "x64" }
-
-
project "UnRAR"
uuid "95CC809B-03FC-4EDB-BB20-FD07A698C05F"
language "C++"
@@ -130,6 +125,7 @@
"../include/unrar/volume.hpp",
}
dofile "../build/premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-static.lua"
@@ -170,6 +166,7 @@
"../include/zlib/zutil.h",
}
dofile "../build/premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-static.lua"
@@ -195,6 +192,7 @@
"../include/zlib/contrib/minizip/zip.h",
}
dofile "../build/premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-static.lua"
@@ -207,6 +205,7 @@
"../include/miniz/miniz.c",
}
dofile "../build/premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-static.lua"
@@ -223,6 +222,7 @@
"../include/smbPitchShift/smbPitchShift.h",
}
dofile "../build/premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-static.lua"
@@ -273,6 +273,7 @@
configuration "vs2008"
includedirs { "../include/msinttypes/stdint" }
dofile "../build/premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-static.lua"
@@ -343,6 +344,7 @@
configuration "vs2008"
defines { "VERSION=\\\"1.3.0\\\"" }
dofile "../build/premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-static.lua"
@@ -415,6 +417,7 @@
configuration "Debug*"
defines { "PA_ENABLE_DEBUG_OUTPUT" }
dofile "../build/premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-static.lua"
@@ -440,6 +443,7 @@
"../include/portmidi/pm_win/pmwinmm.h",
}
dofile "../build/premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-static.lua"
@@ -480,6 +484,7 @@
}
defines { "DLL_EXPORTS", "SOUNDTOUCH_INTEGER_SAMPLES=1" }
dofile "../build/premake4-defaults-DLL.lua"
+ dofile "../build/premake4-defaults-static.lua"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
