Changeset 323 for trunk/nv.lua

Timestamp:

08/26/14 04:03:10 (11 years ago)

Author:

epyon

Message:

• nova now compiles again under all three compilers with -Winsane and no warnings

File:

• trunk/nv.lua (modified) (15 diffs)

trunk/nv.lua

@@ -5 +5 @@
         includedirs { "." }
         files { "nv/core/**.hh", "nv/interface/**.hh", "nv/detail/**.inc", "src/core/**.cc" }
-        targetname "nv-core"
 
 project "nv-lib"
@@ -14 +13 @@
         files { "nv/lib/**.hh", "nv/lib/**.inl", "nv/lib/**.inc", "src/lib/**.cc" }
         links { "nv-core" }
-        targetname "nv-lib"
 
 project "nv-curses"
@@ -23 +21 @@
         files { "nv/curses/**.hh",  "src/curses/**.cc" }
         links { "nv-core", "nv-lib" }
-        targetname "nv-curses"
 
 project "nv-fmod"
@@ -32 +29 @@
         files { "nv/fmod/**.hh",    "src/fmod/**.cc" }
         links { "nv-core", "nv-lib" }
-        targetname "nv-fmod"
 
 project "nv-sdl"
@@ -41 +37 @@
         files { "nv/sdl/**.hh",     "src/sdl/**.cc" }
         links { "nv-core", "nv-lib" }
-        targetname "nv-sdl"
 
 project "nv-gl"
@@ -50 +45 @@
         files { "nv/gl/**.hh",     "src/gl/**.cc" }
         links { "nv-core", "nv-lib" }
-        targetname "nv-gl"
 
 project "nv-lua"
@@ -59 +53 @@
         files { "nv/lua/**.hh",     "src/lua/**.cc" }
         links { "nv-core", "nv-lib" }
-        targetname "nv-lua"
 
 project "nv-rogue"
@@ -68 +61 @@
         files { "nv/rogue/**.hh",     "src/rogue/**.cc" }
         links { "nv-core" }
-        targetname "nv-rogue"
 
 project "nv-io"
@@ -77 +69 @@
         files { "nv/io/**.hh",     "src/io/**.cc" }
         links { "nv-core" }
-        targetname "nv-io"
 
 project "nv-gfx"
@@ -86 +77 @@
         files { "nv/gfx/**.hh",  "src/gfx/**.cc" }
         links { "nv-core" }
-        targetname "nv-gfx"
 
 project "nv-engine"
@@ -94 +84 @@
         includedirs { "." }
         files { "nv/engine/**.hh",  "src/engine/**.cc" }
-        links { "nv-core", "nv-lua" }
-        targetname "nv-engine"
+        links { "nv-core", "nv-lib", "nv-lua" }
 
 project "nv-formats"
@@ -104 +93 @@
         files { "nv/formats/**.hh", "src/formats/**.cc" }
         links { "nv-core", "nv-lib", "nv-io", "nv-gfx" }
-        targetname "nv-formats"
 
 project "nv-gui"
@@ -112 +100 @@
         includedirs { "." }
         files { "nv/gui/**.hh",     "src/gui/**.cc" }
-        links { "nv-core", "nv-io", "nv-gfx", "nv-lua" }
-        targetname "nv-gui"
-
-project "nv"
-        location (_ACTION)
-        language "C++"
-        kind "StaticLib"
-        includedirs { "." }
-        links { "nv-core", "nv-lib", "nv-curses", "nv-sdl", "nv-fmod", "nv-lua", "nv-gl", "nv-rogue", "nv-io", "nv-gfx", "nv-engine", "nv-formats", "nv-gui" }
-        targetname "nv"
+        links { "nv-core", "nv-lib", "nv-io", "nv-gfx", "nv-lua" }
 
 -- injection!
@@ -151 +130 @@
                                 -- no reasonable way to fix this with abstract 
                                 -- interfaces.
-                                "-Wno-weak-vtables"
+                                "-Wno-weak-vtables",
+                                -- this can be reenabled if I find a nice solution
+                                "-Wno-cast-align",
                         }
                         --buildoptions { 
@@ -159 +140 @@
                         buildoptions { "-std=c++0x" }
                 end
+        configuration { "windows", "gmake" }
+                linkoptions { "-mwindows" }
 
         configuration "linux"