Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3106] trunk/OpenMPT
|
From: <man...@us...> - 2013-11-06 19:04:21
|
Revision: 3106
http://sourceforge.net/p/modplug/code/3106
Author: manxorist
Date: 2013-11-06 19:04:12 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
[Int] Move premake defaults to build/.
[Int] Move premake script to build/ and make it callable from either /build/ or / .
[Int] Expect premake4.exe in build/ instead of in include/ .
[Ref] Tiny include/premake4.lua cleanup.
Modified Paths:
--------------
trunk/OpenMPT/include/premake4.lua
Added 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/premake4-defaults.lua
trunk/OpenMPT/build/update_premake4_projects.cmd
Removed Paths:
-------------
trunk/OpenMPT/include/premake4-defaults-DLL.lua
trunk/OpenMPT/include/premake4-defaults-EXE.lua
trunk/OpenMPT/include/premake4-defaults-LIB.lua
trunk/OpenMPT/include/premake4-defaults.lua
trunk/OpenMPT/include/update_premake4_projects.cmd
Property Changed:
----------------
trunk/OpenMPT/build/
Index: trunk/OpenMPT/build
===================================================================
--- trunk/OpenMPT/build 2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/build 2013-11-06 19:04:12 UTC (rev 3106)
Property changes on: trunk/OpenMPT/build
___________________________________________________________________
Modified: svn:ignore
## -1,2 +1,3 ##
lib
obj
+premake4.exe
Copied: trunk/OpenMPT/build/premake4-defaults-DLL.lua (from rev 3105, trunk/OpenMPT/include/premake4-defaults-DLL.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-defaults-DLL.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-defaults-DLL.lua 2013-11-06 19:04:12 UTC (rev 3106)
@@ -0,0 +1,23 @@
+
+ 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"
+
+ dofile "premake4-defaults.lua"
Copied: trunk/OpenMPT/build/premake4-defaults-EXE.lua (from rev 3105, trunk/OpenMPT/include/premake4-defaults-EXE.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-defaults-EXE.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-defaults-EXE.lua 2013-11-06 19:04:12 UTC (rev 3106)
@@ -0,0 +1,23 @@
+
+ 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"
+
+ dofile "premake4-defaults.lua"
Copied: trunk/OpenMPT/build/premake4-defaults-LIB.lua (from rev 3105, trunk/OpenMPT/include/premake4-defaults-LIB.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-defaults-LIB.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-defaults-LIB.lua 2013-11-06 19:04:12 UTC (rev 3106)
@@ -0,0 +1,23 @@
+
+ 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"
+
+ dofile "premake4-defaults.lua"
Copied: trunk/OpenMPT/build/premake4-defaults.lua (from rev 3105, trunk/OpenMPT/include/premake4-defaults.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-defaults.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-defaults.lua 2013-11-06 19:04:12 UTC (rev 3106)
@@ -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" }
Copied: trunk/OpenMPT/build/update_premake4_projects.cmd (from rev 3104, trunk/OpenMPT/include/update_premake4_projects.cmd)
===================================================================
--- trunk/OpenMPT/build/update_premake4_projects.cmd (rev 0)
+++ trunk/OpenMPT/build/update_premake4_projects.cmd 2013-11-06 19:04:12 UTC (rev 3106)
@@ -0,0 +1,25 @@
+@echo off
+
+set MY_DIR=%CD%
+
+cd build
+cd .. || goto err
+
+echo dofile "include/premake4.lua" > premake4.lua || goto err
+
+build\premake4.exe vs2010 || goto err
+build\premake4.exe vs2008 || goto err
+
+del premake4.lua || goto err
+
+cd %MY_DIR% || goto err
+
+goto end
+
+:err
+echo ERROR!
+goto end
+
+:end
+cd %MY_DIR%
+pause
Deleted: trunk/OpenMPT/include/premake4-defaults-DLL.lua
===================================================================
--- trunk/OpenMPT/include/premake4-defaults-DLL.lua 2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/include/premake4-defaults-DLL.lua 2013-11-06 19:04:12 UTC (rev 3106)
@@ -1,23 +0,0 @@
-
- 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"
-
- dofile "premake4-defaults.lua"
Deleted: trunk/OpenMPT/include/premake4-defaults-EXE.lua
===================================================================
--- trunk/OpenMPT/include/premake4-defaults-EXE.lua 2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/include/premake4-defaults-EXE.lua 2013-11-06 19:04:12 UTC (rev 3106)
@@ -1,23 +0,0 @@
-
- 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"
-
- dofile "premake4-defaults.lua"
Deleted: trunk/OpenMPT/include/premake4-defaults-LIB.lua
===================================================================
--- trunk/OpenMPT/include/premake4-defaults-LIB.lua 2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/include/premake4-defaults-LIB.lua 2013-11-06 19:04:12 UTC (rev 3106)
@@ -1,23 +0,0 @@
-
- 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"
-
- dofile "premake4-defaults.lua"
Deleted: trunk/OpenMPT/include/premake4-defaults.lua
===================================================================
--- trunk/OpenMPT/include/premake4-defaults.lua 2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/include/premake4-defaults.lua 2013-11-06 19:04:12 UTC (rev 3106)
@@ -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" }
Modified: trunk/OpenMPT/include/premake4.lua
===================================================================
--- trunk/OpenMPT/include/premake4.lua 2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/include/premake4.lua 2013-11-06 19:04:12 UTC (rev 3106)
@@ -129,7 +129,7 @@
"../include/unrar/version.hpp",
"../include/unrar/volume.hpp",
}
- dofile "premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-LIB.lua"
@@ -169,7 +169,7 @@
"../include/zlib/zlib.h",
"../include/zlib/zutil.h",
}
- dofile "premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-LIB.lua"
@@ -194,7 +194,7 @@
"../include/zlib/contrib/minizip/unzip.h",
"../include/zlib/contrib/minizip/zip.h",
}
- dofile "premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-LIB.lua"
@@ -206,7 +206,7 @@
files {
"../include/miniz/miniz.c",
}
- dofile "premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-LIB.lua"
@@ -222,7 +222,7 @@
files {
"../include/smbPitchShift/smbPitchShift.h",
}
- dofile "premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-LIB.lua"
@@ -272,7 +272,7 @@
}
configuration "vs2008"
includedirs { "../include/msinttypes/stdint" }
- dofile "premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-LIB.lua"
@@ -339,7 +339,7 @@
defines { "VERSION=\"1.2.1\"" }
configuration "vs2008"
defines { "VERSION=\\\"1.2.1\\\"" }
- dofile "premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-LIB.lua"
@@ -411,7 +411,7 @@
buildoptions { "/wd4018", "/wd4267" }
configuration "Debug*"
defines { "PA_ENABLE_DEBUG_OUTPUT" }
- dofile "premake4-defaults-LIB.lua"
+ dofile "../build/premake4-defaults-LIB.lua"
@@ -436,18 +436,10 @@
"../include/portmidi/pm_common/portmidi.h",
"../include/portmidi/pm_win/pmwinmm.h",
}
- dofile "premake4-defaults-LIB.lua"
-
+ dofile "../build/premake4-defaults-LIB.lua"
-
-
-
-solution "includeDLL"
- configurations { "Debug", "Release", "ReleaseNoLTCG" }
- platforms { "x32", "x64" }
-
project "soundtouch"
uuid "F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD"
language "C++"
@@ -484,7 +476,7 @@
"../include/soundtouch/TDStretch.h",
}
defines { "DLL_EXPORTS", "SOUNDTOUCH_INTEGER_SAMPLES=1" }
- dofile "premake4-defaults-DLL.lua"
+ dofile "../build/premake4-defaults-DLL.lua"
Deleted: trunk/OpenMPT/include/update_premake4_projects.cmd
===================================================================
--- trunk/OpenMPT/include/update_premake4_projects.cmd 2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/include/update_premake4_projects.cmd 2013-11-06 19:04:12 UTC (rev 3106)
@@ -1,2 +0,0 @@
-premake4.exe vs2010
-premake4.exe vs2008
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
