Changeset 995 for sfz/trunk/premake.lua

Timestamp:

06/10/08 21:07:51 (7 months ago)

Author:

ghoulsblade

Message:

updated premake.lua for lugre changes including lua5.1

Files:

• sfz/trunk/premake.lua (modified) (10 diffs)

sfz/trunk/premake.lua

@@ -7 +7 @@
 -- project.path = "build"
 -- project.bindir = "."
+
+-- default values
 gbExtraWarnings = false
-
+gbOptimize = true
+gOisPlatform = "linux"
+gbUseSystemOis = true -- static compile ois segfaultet at mKeyboard->setTextTranslation, ois-headers in system incompatible ?
+gbNo64BitChecks = false
+
+-- build options
 addoption("wall","very verbose report, most warnings enabled")
+addoption("nooptimize","don't use optmize compile flags")
+addoption("no64bitcheck","don't do any 64bit checks")
+addoption("usesystemois","use the systemwide installed ois not the one included in lugre")
+addoption("oisplatform","select OIS platform (linux,mac,SDL,win32, default:linux), only valid if lugre ois is used")
+
 if (options["wall"]) then gbExtraWarnings = true print("extra warnings enabled") end
+if (options["nooptimize"]) then gbOptimize = false print("optimization disabled") end
+if (options["usesystemois"]) then gbUseSystemOis = true print("using systemwide installed ois") end
+if (options["oisplatform"]) then gOisPlatform = options["oisplatform"] print("using oisplatform: "..gOisPlatform) end
+if (options["no64bitcheck"]) then gbNo64BitChecks = true print("disabled 64bit checks") end
 
 gLugreDir = "lugre"
 if (io.open("mylugre/lua/lugre.lua")) then print("using mylugre dir override") gLugreDir = "mylugre" end
 
-gLugreLuaSrcDir = "./"..gLugreDir.."/lib/lua-5.0.3/"
+gLugreLuaSrcDir = "./"..gLugreDir.."/lib/lua-5.1.3/"
+gLugreOisDir = "./"..gLugreDir.."/baselib/ois/"
 
 -- list of easy libs inclusion (located in lugre/lib/NAME). this will add lugre/lib/NAME/src and lugre/lib/NAME/include.
@@ -21 +38 @@
         "cadune_tree",
         "md5",
-        "paged_geometry",
+        --~ "paged_geometry",
         "caelum",
 }
@@ -28 +45 @@
 function AddLugreDeps(package)
         package.defines = { 
-        "USE_OPENAL",
-        "MAIN_WORKING_DIR=\\\".\\\"",
-        "LUA_DIR=\\\"lua\\\"",
-        "LUGRE_DIR=\\\""..gLugreDir.."\\\"",
-        "DATA_DIR=\\\"data\\\"",
-        "ENABLE_THREADS",
-}       
+                "USE_OPENAL",
+                "MAIN_WORKING_DIR=\\\".\\\"",
+                "LUA_DIR=\\\"lua\\\"",
+                "LUGRE_DIR=\\\""..gLugreDir.."\\\"",
+                "DATA_DIR=\\\"data\\\"",
+                "ENABLE_THREADS",
+        }       
 
         addpkgconfiglib(package, "OGRE")
-        addpkgconfiglib(package, "OIS")
+        if gbUseSystemOis then addpkgconfiglib(package, "OIS") end
         addpkgconfiglib(package, "openal")
         addpkgconfiglib(package, "vorbisfile")
@@ -47 +64 @@
 
         table.insert(package.links, "lugrelua")
-        table.insert(package.links, "lugrelualib")
+        --table.insert(package.links, "lugrelualib")
 
         -- add lib defines like USE_LUGRE_LIB_NAME
@@ -97 +114 @@
 package.kind = "lib"
 package.language = "c++"
-package.buildflags = { gbExtraWarnings and "extra-warnings" or nil, "optimize" }
-package.buildoptions = {}
-package.includepaths = { gLugreLuaSrcDir.."/include" }
-package.files = {
-  matchfiles(gLugreLuaSrcDir.."/include/*.h", gLugreLuaSrcDir.."/src/*.c"),
-}
-
--- ---------------------------------------------
-
+package.buildflags = { gbExtraWarnings and "extra-warnings" or nil, gbOptimize and "optimize" or nil, gbNo64BitChecks and "no-64bit-checks" or nil }
+package.buildoptions = {}
+package.includepaths = { gLugreLuaSrcDir.."/src" }
+package.defines = { 
+        "LUA_USE_POPEN", -- execute shellcommands
+}       
+package.files = {
+  matchfiles(gLugreLuaSrcDir.."/src/*.h", gLugreLuaSrcDir.."/src/*.c"),
+}
+
+-- ---------------------------------------------
+
+-- obsolete with lua5.1 ?
+--[[
 package = newpackage()
 package.name = "lugrelualib"
@@ -116 +138 @@
   matchfiles(gLugreLuaSrcDir.."/include/*.h", gLugreLuaSrcDir.."/src/lib/*.c"),
 }
-
+]]--
+
+
+-- ---------------------------------------------
+-- OIS
+-- ---------------------------------------------
+if not gbUseSystemOis then
+        print("OIS platform: "..gOisPlatform)
+        gOisPlatform = "linux"
+        oisinclude = {gLugreOisDir.."/includes", gLugreOisDir.."/includes/"..gOisPlatform}
+        package = newpackage()
+        package.name = "lugreois"
+        package.kind = "lib"
+        package.language = "c++"
+        package.buildflags = { gbExtraWarnings and "extra-warnings" or nil, gbOptimize and "optimize" or nil, gbNo64BitChecks and "no-64bit-checks" or nil }
+        package.buildoptions = {}
+        package.includepaths = { unpack(oisinclude) }
+        package.defines = { 
+                --"LUA_USE_POPEN", -- execute shellcommands
+        }       
+        package.files = {
+          matchfiles(gLugreOisDir.."/src/*.h", gLugreOisDir.."/src/*.cpp"),
+          matchfiles(gLugreOisDir.."/src/"..gOisPlatform.."/*.h", gLugreOisDir.."/src/"..gOisPlatform.."/*.cpp"),
+        }
+end
 -- ---------------------------------------------
 -- LUGRE LIBS
@@ -127 +173 @@
         package.kind = "lib"
         package.language = "c++"
-        package.buildflags = { gbExtraWarnings and "extra-warnings" or nil, "optimize" }
+        package.buildflags = { gbExtraWarnings and "extra-warnings" or nil, gbOptimize and "optimize" or nil, gbNo64BitChecks and "no-64bit-checks" or nil }
         package.buildoptions = {}
-        package.includepaths = { gLugreDir.."/include", gLugreLuaSrcDir.."/include/", "include" }
+        package.includepaths = { gLugreDir.."/include", gLugreLuaSrcDir.."/src/", "include", oisinclude and unpack(oisinclude) or nil }
         package.files = {
-                matchfiles(gLugreLuaSrcDir.."/include/*.h", gLugreLuaSrcDir.."/src/lib/*.c"),
+                matchfiles(gLugreLuaSrcDir.."/src/*.h", gLugreLuaSrcDir.."/src/*.c"),
         }
         table.insert(package.files, matchrecursive(gLugreDir.."/lib/"..v.."/include/*.h")) 
@@ -148 +194 @@
 package.kind = "lib"
 package.language = "c++"
-package.links = { "lugrelua", "lugrelualib" }
-package.buildflags = { bExtraWarnings and "extra-warnings" or nil, "optimize" }
-package.buildoptions = {}
-package.includepaths = { gLugreLuaSrcDir.."/include", gLugreDir.."/include" }
+package.links = {  }
+package.buildflags = { bExtraWarnings and "extra-warnings" or nil, gbOptimize and "optimize" or nil, gbNo64BitChecks and "no-64bit-checks" or nil }
+package.buildoptions = {}
+package.includepaths = { gLugreLuaSrcDir.."/src", gLugreDir.."/include" }
 package.files = {
   matchrecursive(gLugreDir.."/include/*.h", gLugreDir.."/src/*.cpp"),
@@ -166 +212 @@
 package.language = "c++"
 -- package.bindir = "bin"
-package.buildflags = { gbExtraWarnings and "extra-warnings" or nil, "optimize" }
-package.buildoptions = {}
-
-package.includepaths = { gLugreDir.."/include", gLugreLuaSrcDir.."/include/", "include" }
+package.buildflags = { gbExtraWarnings and "extra-warnings" or nil, gbOptimize and "optimize" or nil, gbNo64BitChecks and "no-64bit-checks" or nil }
+package.buildoptions = {}
+
+package.includepaths = { gLugreDir.."/include", gLugreLuaSrcDir.."/src/", "include" }
 -- add lib includes
 for k,v in pairs(gLugreLibList) do 
@@ -176 +222 @@
 
 package.linkoptions = {}
-package.links = { "lugrelua","lugrelualib" }
-
-package.links = { "lugrelib" }
+package.links = { "lugrelib", "lugrelua", not gbUseSystemOis and "lugreois" or nil  }
 AddLugreDeps(package)