[Yake-svn] SF.net SVN: yake:[2024] branches/yake2/yake/premake4.lua

[<psy...@us...>]

Revision: 2024
          http://yake.svn.sourceforge.net/yake/?rev=2024&view=rev
Author:   psyclonist
Date:     2010-04-10 08:21:25 +0000 (Sat, 10 Apr 2010)

Log Message:
-----------
premake4.lua:
* removed dependency to QtWebKit4
* reactivated libs: input, bindings.lua
* added new demo

Modified Paths:
--------------
    branches/yake2/yake/premake4.lua

Modified: branches/yake2/yake/premake4.lua
===================================================================
--- branches/yake2/yake/premake4.lua	2010-04-10 08:19:59 UTC (rev 2023)
+++ branches/yake2/yake/premake4.lua	2010-04-10 08:21:25 UTC (rev 2024)
@@ -7,8 +7,14 @@
 
 DEBUG_DLL_SUFFIX = "dll"
 YAKE_LIBFILE_PREFIX = "yake_"
+
 YAKE_LUA_BINDINGS = true
 ENABLE_LUA_BASE = true
+ENABLE_LUA_PHYSICS = true
+ENABLE_LUA_GRAPHICS = true
+ENABLE_LUA_GRAPHICS_OGRE = true
+ENABLE_LUA_INPUT = true
+ENABLE_LUA_RES = true
 
 --
 local yake_deps = {}
@@ -79,10 +85,10 @@
     },
     libdirs = { DEP_DIR.."qt/lib" },
     links = {
-      ["DebugLib"] = { "QtCored4","QtGuid4","QtWebKitd4","QtOpenGLd4" },
-      ["DebugDLL"] = { "QtCored4","QtGuid4","QtWebKitd4","QtOpenGLd4" },
-      ["ReleaseLib"] = { "QtCore4","QtGui4","QtWebKit4","QtOpenGL4" },
-      ["ReleaseDLL"] = { "QtCore4","QtGui4","QtWebKit4","QtOpenGL4"  },
+      ["DebugLib"] = { "QtCored4","QtGuid4","QtOpenGLd4" },
+      ["DebugDLL"] = { "QtCored4","QtGuid4","QtOpenGLd4" },
+      ["ReleaseLib"] = { "QtCore4","QtGui4","QtOpenGL4" },
+      ["ReleaseDLL"] = { "QtCore4","QtGui4","QtOpenGL4"  },
     }
   }
   yake_deps["gl"] = {
@@ -253,17 +259,17 @@
   f:write("#define YAKE_LIBFILE_PREFIX \"" .. YAKE_LIBFILE_PREFIX .. "\"\n")
   f:write("#define YAKE_LUA_BINDINGS " .. bool_to_int(LUA_BINDINGS) .. "\n")
   f:write("#define YAKE_ENABLE_LUA_BASE " .. bool_to_int(ENABLE_LUA_BASE) .. "\n")
+  f:write("#define YAKE_ENABLE_LUA_GRAPHICS " .. bool_to_int(ENABLE_LUA_GRAPHICS) .. "\n")
+  f:write("#define YAKE_ENABLE_LUA_GRAPHICS_OGRE " .. bool_to_int(ENABLE_LUA_GRAPHICS_OGRE) .. "\n")
+  f:write("#define YAKE_ENABLE_LUA_PHYSICS " .. bool_to_int(ENABLE_LUA_PHYSICS) .. "\n")
+  f:write("#define YAKE_ENABLE_LUA_INPUT " .. bool_to_int(ENABLE_LUA_INPUT) .. "\n")
+  f:write("#define YAKE_ENABLE_LUA_RES " .. bool_to_int(ENABLE_LUA_RES) .. "\n")
   --[[
   f:write("#define YAKE_ENABLE_LUA_MODEL " .. bool_to_int(ENABLE_LUA_MODEL) .. "\n")
   f:write("#define YAKE_ENABLE_LUA_TASK " .. bool_to_int(ENABLE_LUA_TASK) .. "\n")
   f:write("#define YAKE_ENABLE_LUA_ENT " .. bool_to_int(ENABLE_LUA_ENT) .. "\n")
   f:write("#define YAKE_ENABLE_LUA_PROPERTY " .. bool_to_int(ENABLE_LUA_PROPERTY) .. "\n")
-  f:write("#define YAKE_ENABLE_LUA_GRAPHICS " .. bool_to_int(ENABLE_LUA_GRAPHICS) .. "\n")
-  f:write("#define YAKE_ENABLE_LUA_GRAPHICS_OGRE " .. bool_to_int(ENABLE_LUA_GRAPHICS_OGRE) .. "\n")
-  f:write("#define YAKE_ENABLE_LUA_PHYSICS " .. bool_to_int(ENABLE_LUA_PHYSICS) .. "\n")
-  f:write("#define YAKE_ENABLE_LUA_INPUT " .. bool_to_int(ENABLE_LUA_INPUT) .. "\n")
   f:write("#define YAKE_ENABLE_LUA_RAF " .. bool_to_int(ENABLE_LUA_RAF) .. "\n")
-  f:write("#define YAKE_ENABLE_LUA_RES " .. bool_to_int(ENABLE_LUA_RES) .. "\n")
   f:write("#define YAKE_ENABLE_LUA_UI " .. bool_to_int(ENABLE_LUA_UI) .. "\n")
   f:write("\n")
   f:write("#define YAKE_RAF_USES_CEGUI " .. bool_to_int(ENABLE_RAF_CEGUI) .. "\n")
@@ -349,6 +355,12 @@
     end
     flags { "Optimize" }
 
+    
+local function make_project_api_define(name)
+  local out = "YAKE_" .. name:gsub("%p","_"):upper() .. "_EXPORTS"
+  --print(out)
+  return out
+end
 -- kind (solution/project/configuration): ConsoleApp, WindowedApp, SharedLib, StaticLib
 --[[project "base"
   location ( ROOT_DIR .. "build/" .. _ACTION )
@@ -381,7 +393,7 @@
   
   configuration "ReleaseDLL"
     targetname(YAKE_LIBFILE_PREFIX.. name.."_"..mapActionToCompilerName[_ACTION])
-    defines { "YAKE_" .. name:upper() .. "_EXPORTS" }
+    defines { make_project_api_define(name) }
     require_package_links( "ReleaseDLL", opt.require_package )
     if os.is("windows") then
       links { "winmm" }
@@ -390,7 +402,7 @@
 
   configuration "DebugDLL"
     targetname(YAKE_LIBFILE_PREFIX.. name.."_"..mapActionToCompilerName[_ACTION].."_d")
-    defines { "YAKE_" .. name:upper() .. "_EXPORTS" }
+    defines { make_project_api_define(name) }
     require_package_links( "DebugDLL", opt.require_package )
     if os.is("windows") then
       links { "winmm" }
@@ -510,6 +522,10 @@
   requires_lib "base"
   requires_lib "log"
 
+project_lib("input", {require_package = {"boost"}})
+  requires_lib "base"
+  requires_lib "log"
+
 project_lib("audio", {require_package = {"boost"}})
   requires_lib "base"
   requires_lib "log"
@@ -527,7 +543,7 @@
   requires_lib "log"
 
 project_lib("qtogre", {require_package = {"qt","ogre","gl"}})
-  --requires_lib "base"
+  requires_lib "base" -- for YAKE_ASSERT
   --requires_lib "log"
 
 project_lib("object", {require_package = {"boost"}})
@@ -538,6 +554,17 @@
   requires_lib "base"
   requires_lib "log"
   requires_lib "object"
+  
+project_lib("bindings.lua", {require_package = {"boost","lua","luabind","ogre"}})
+  requires_lib "base"
+  requires_lib "log"
+  requires_lib "graphics"
+  requires_lib "physics"
+  requires_lib "input"
+  requires_lib "res"
+  requires_lib "scripting"
+  requires_plugin "scriptingLua"
+  requires_plugin "graphicsOgre"
 
 -- plugins
 project_plugin("graphicsOgre", {require_package = {"boost","ogre"}})
@@ -578,8 +605,13 @@
     requires_lib "graphics"
     requires_lib "qtogre"
     requires_lib "qt"
-  project_exe "property3"
+  project_exe("property2_physics", {require_package = {"boost","qt"}})
     requires_lib "log"
+    requires_lib "property2"
+    requires_lib "graphics"
+    requires_lib "physics"
+    requires_lib "qtogre"
+    requires_lib "qt"
 end
 --[[
 project "demo1"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.