From d8ccff4affd9106f8c25662f9a4b51f4903c3832 Mon Sep 17 00:00:00 2001 From: Daniel Collin Date: Mon, 7 Jan 2013 08:41:16 +0100 Subject: [PATCH] Moved tundra.lua and units.lua to ogl_editor (This is to make RocketEditor fully separated from the regular GNU Rocket codebase) --- ogl_editor/tundra.lua | 36 +++++++++++++ ogl_editor/units.lua | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++ tundra.lua | 36 ------------- units.lua | 136 -------------------------------------------------- 4 files changed, 172 insertions(+), 172 deletions(-) create mode 100644 ogl_editor/tundra.lua create mode 100644 ogl_editor/units.lua delete mode 100644 tundra.lua delete mode 100644 units.lua diff --git a/ogl_editor/tundra.lua b/ogl_editor/tundra.lua new file mode 100644 index 0000000..b1140f0 --- /dev/null +++ b/ogl_editor/tundra.lua @@ -0,0 +1,36 @@ +local macosx = { + Env = { + CPPDEFS = { "EMGUI_MACOSX" }, + CCOPTS = { + "-Wall", + "-Wno-deprecated-declarations", -- TickCount issue no Mountain Lion (needs to be fixed) + "-I.", "-DMACOSX", "-Wall", + { "-O0", "-g"; Config = "*-*-debug" }, + { "-O3"; Config = "*-*-release" }, + }, + }, + + Frameworks = { "Cocoa" }, +} + +local win32 = { + Env = { + GENERATE_PDB = "1", + CCOPTS = { + "/W4", "/I.", "/WX", "/DUNICODE", "/D_UNICODE", "/DWIN32", "/D_CRT_SECURE_NO_WARNINGS", "/wd4996", + { "/Od"; Config = "*-*-debug" }, + { "/O2"; Config = "*-*-release" }, + }, + }, +} + +Build { + Units = "units.lua", + + SyntaxExtensions = { "tundra.syntax.glob", "tundra.syntax.osx-bundle" }, + + Configs = { + Config { Name = "macosx-clang", DefaultOnHost = "macosx", Inherit = macosx, Tools = { "clang-osx" } }, + Config { Name = "win32-msvc", DefaultOnHost = { "windows" }, Inherit = win32, Tools = { "msvc" } }, + }, +} diff --git a/ogl_editor/units.lua b/ogl_editor/units.lua new file mode 100644 index 0000000..7d89bf6 --- /dev/null +++ b/ogl_editor/units.lua @@ -0,0 +1,136 @@ +StaticLibrary { + Name = "mxml", + + Env = { + CPPPATH = { ".", "ogl_rocket/external/mxml" }, + PROGOPTS = { + { "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } }, + }, + + CPPDEFS = { + {"_THREAD_SAFE", "_REENTRANT"; Config = "macosx-*-*" } + }, + + CCOPTS = { + { "-Wall"; Config = "macosx-clang-*" }, + }, + }, + + Sources = { + Glob { + Dir = "ogl_editor/external/mxml", + Extensions = { ".c" }, + }, + }, +} + +StaticLibrary { + Name = "emgui", + + Env = { + CPPPATH = { ".", "../../emgui/src", "../../../../emgui/src" }, + PROGOPTS = { + { "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } }, + }, + + CPPDEFS = { + { "EMGUI_MACOSX", Config = "macosx-*-*" }, + { "EMGUI_WINDOWS"; Config = { "win32-*-*", "win64-*-*" } }, + }, + + CCOPTS = { + { "-Werror", "-pedantic-errors", "-Wall"; Config = "macosx-clang-*" }, + }, + }, + + Sources = { + FGlob { + Dir = "../emgui/src", + Extensions = { ".c" }, + Filters = { + { Pattern = "macosx"; Config = "macosx-*-*" }, + { Pattern = "windows"; Config = { "win32-*-*", "win64-*-*" } }, + }, + }, + }, +} + + +StaticLibrary { + Name = "sync", + + Sources = { + Glob { + Dir = "sync", + Extensions = { ".c" }, + }, + }, +} + + +Program { + Name = "editor", + + Env = { + CPPPATH = { ".", "ogl_editor/src", + "../emgui/src", + "../../../../../emgui/src", + "ogl_editor/External/mxml" }, + PROGOPTS = { + { "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } }, + }, + + CPPDEFS = { + { "EMGUI_MACOSX", Config = "macosx-*-*" }, + { "ROCKETGUI_WIN32"; Config = { "win32-*-*", "win64-*-*" } }, + }, + + CCOPTS = { + { "-Werror", "-pedantic-errors", "-Wall"; Config = "macosx-clang-*" }, + }, + }, + + Sources = { + FGlob { + Dir = "ogl_editor/src", + --Extensions = { ".c", { ".m"; Config = "macosx-*-*" } }, + Extensions = { ".c", ".m" }, + Filters = { + { Pattern = "macosx"; Config = "macosx-*-*" }, + { Pattern = "windows"; Config = { "win32-*-*", "win64-*-*" } }, + }, + }, + + { "ogl_editor/data/windows/editor.rc" ; Config = { "win32-*-*", "win64-*-*" } }, + }, + + Depends = { "sync", "mxml", "emgui" }, + + Libs = { { "wsock32.lib", "opengl32.lib", "glu32.lib", "kernel32.lib", "user32.lib", "gdi32.lib", "Comdlg32.lib" ; Config = "win32-*-*" } }, + + Frameworks = { "Cocoa", "OpenGL", "Carbon" }, + +} + +local rocketBundle = OsxBundle +{ + Depends = { "editor" }, + Target = "$(OBJECTDIR)/RocketEditor.app", + InfoPList = "ogl_editor/data/macosx/Info.plist", + Executable = "$(OBJECTDIR)/editor", + Resources = { + CompileNib { Source = "ogl_editor/data/macosx/appnib.xib", Target = "appnib.nib" }, + "ogl_editor/data/macosx/icon.icns", + }, +} + +local native = require('tundra.native') + +if native.host_platform == "macosx" then + Default(rocketBundle) +else + Default "editor" +end + + + diff --git a/tundra.lua b/tundra.lua deleted file mode 100644 index b1140f0..0000000 --- a/tundra.lua +++ /dev/null @@ -1,36 +0,0 @@ -local macosx = { - Env = { - CPPDEFS = { "EMGUI_MACOSX" }, - CCOPTS = { - "-Wall", - "-Wno-deprecated-declarations", -- TickCount issue no Mountain Lion (needs to be fixed) - "-I.", "-DMACOSX", "-Wall", - { "-O0", "-g"; Config = "*-*-debug" }, - { "-O3"; Config = "*-*-release" }, - }, - }, - - Frameworks = { "Cocoa" }, -} - -local win32 = { - Env = { - GENERATE_PDB = "1", - CCOPTS = { - "/W4", "/I.", "/WX", "/DUNICODE", "/D_UNICODE", "/DWIN32", "/D_CRT_SECURE_NO_WARNINGS", "/wd4996", - { "/Od"; Config = "*-*-debug" }, - { "/O2"; Config = "*-*-release" }, - }, - }, -} - -Build { - Units = "units.lua", - - SyntaxExtensions = { "tundra.syntax.glob", "tundra.syntax.osx-bundle" }, - - Configs = { - Config { Name = "macosx-clang", DefaultOnHost = "macosx", Inherit = macosx, Tools = { "clang-osx" } }, - Config { Name = "win32-msvc", DefaultOnHost = { "windows" }, Inherit = win32, Tools = { "msvc" } }, - }, -} diff --git a/units.lua b/units.lua deleted file mode 100644 index 7d89bf6..0000000 --- a/units.lua +++ /dev/null @@ -1,136 +0,0 @@ -StaticLibrary { - Name = "mxml", - - Env = { - CPPPATH = { ".", "ogl_rocket/external/mxml" }, - PROGOPTS = { - { "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } }, - }, - - CPPDEFS = { - {"_THREAD_SAFE", "_REENTRANT"; Config = "macosx-*-*" } - }, - - CCOPTS = { - { "-Wall"; Config = "macosx-clang-*" }, - }, - }, - - Sources = { - Glob { - Dir = "ogl_editor/external/mxml", - Extensions = { ".c" }, - }, - }, -} - -StaticLibrary { - Name = "emgui", - - Env = { - CPPPATH = { ".", "../../emgui/src", "../../../../emgui/src" }, - PROGOPTS = { - { "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } }, - }, - - CPPDEFS = { - { "EMGUI_MACOSX", Config = "macosx-*-*" }, - { "EMGUI_WINDOWS"; Config = { "win32-*-*", "win64-*-*" } }, - }, - - CCOPTS = { - { "-Werror", "-pedantic-errors", "-Wall"; Config = "macosx-clang-*" }, - }, - }, - - Sources = { - FGlob { - Dir = "../emgui/src", - Extensions = { ".c" }, - Filters = { - { Pattern = "macosx"; Config = "macosx-*-*" }, - { Pattern = "windows"; Config = { "win32-*-*", "win64-*-*" } }, - }, - }, - }, -} - - -StaticLibrary { - Name = "sync", - - Sources = { - Glob { - Dir = "sync", - Extensions = { ".c" }, - }, - }, -} - - -Program { - Name = "editor", - - Env = { - CPPPATH = { ".", "ogl_editor/src", - "../emgui/src", - "../../../../../emgui/src", - "ogl_editor/External/mxml" }, - PROGOPTS = { - { "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } }, - }, - - CPPDEFS = { - { "EMGUI_MACOSX", Config = "macosx-*-*" }, - { "ROCKETGUI_WIN32"; Config = { "win32-*-*", "win64-*-*" } }, - }, - - CCOPTS = { - { "-Werror", "-pedantic-errors", "-Wall"; Config = "macosx-clang-*" }, - }, - }, - - Sources = { - FGlob { - Dir = "ogl_editor/src", - --Extensions = { ".c", { ".m"; Config = "macosx-*-*" } }, - Extensions = { ".c", ".m" }, - Filters = { - { Pattern = "macosx"; Config = "macosx-*-*" }, - { Pattern = "windows"; Config = { "win32-*-*", "win64-*-*" } }, - }, - }, - - { "ogl_editor/data/windows/editor.rc" ; Config = { "win32-*-*", "win64-*-*" } }, - }, - - Depends = { "sync", "mxml", "emgui" }, - - Libs = { { "wsock32.lib", "opengl32.lib", "glu32.lib", "kernel32.lib", "user32.lib", "gdi32.lib", "Comdlg32.lib" ; Config = "win32-*-*" } }, - - Frameworks = { "Cocoa", "OpenGL", "Carbon" }, - -} - -local rocketBundle = OsxBundle -{ - Depends = { "editor" }, - Target = "$(OBJECTDIR)/RocketEditor.app", - InfoPList = "ogl_editor/data/macosx/Info.plist", - Executable = "$(OBJECTDIR)/editor", - Resources = { - CompileNib { Source = "ogl_editor/data/macosx/appnib.xib", Target = "appnib.nib" }, - "ogl_editor/data/macosx/icon.icns", - }, -} - -local native = require('tundra.native') - -if native.host_platform == "macosx" then - Default(rocketBundle) -else - Default "editor" -end - - -