ogl_editor: build for linux with tundra
Remove testing scripts and use the build system in linux too
This commit is contained in:
parent
a083256fbf
commit
4594187ecb
1
ogl_editor/.gitignore
vendored
1
ogl_editor/.gitignore
vendored
@ -1,5 +1,6 @@
|
|||||||
tags
|
tags
|
||||||
tundra-output
|
tundra-output
|
||||||
|
t2-output
|
||||||
.tundra*
|
.tundra*
|
||||||
*.swp
|
*.swp
|
||||||
*.swo
|
*.swo
|
||||||
|
|||||||
@ -1,2 +0,0 @@
|
|||||||
gcc -c `sdl-config --cflags` src/linux/*.c -I emgui/include/ -DEMGUI_UNIX
|
|
||||||
gcc *.o -lSDL -lGL -lm
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
gcc $CFLAGS -c external/mxml/*.c -D_THREAD_SAFE -D_REENTRANT
|
|
||||||
gcc $CFLAGS -c emgui/src/*.c emgui/src/*/*.c -DEMGUI_UNIX -I emgui/include -I emgui/src/
|
|
||||||
gcc $CFLAGS ../sync/*.c -c
|
|
||||||
gcc $CFLAGS -c src/*.c -DEMGUI_UNIX -I emgui/include -I external/mxml/ -I src/
|
|
||||||
gcc $CFLAGS -c `sdl-config --cflags` src/linux/*.c -I emgui/include/ -DEMGUI_UNIX
|
|
||||||
gcc $CFLAGS *.o -lSDL -lGL -lm
|
|
||||||
1
ogl_editor/linux-build.sh
Executable file
1
ogl_editor/linux-build.sh
Executable file
@ -0,0 +1 @@
|
|||||||
|
tundra linux-gcc-release
|
||||||
@ -24,11 +24,24 @@ local win32 = {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
local linux = {
|
||||||
|
Env = {
|
||||||
|
CPPDEFS = { "EMGUI_UNIX" },
|
||||||
|
CCOPTS = {
|
||||||
|
"-I.",
|
||||||
|
"`sdl-config --cflags`",
|
||||||
|
{ "-O0", "-g"; Config = "*-*-debug" },
|
||||||
|
{ "-O2"; Config = "*-*-release" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
Build {
|
Build {
|
||||||
Units = "units.lua",
|
Units = "units.lua",
|
||||||
|
|
||||||
Configs = {
|
Configs = {
|
||||||
Config { Name = "macosx-clang", DefaultOnHost = "macosx", Inherit = macosx, Tools = { "clang-osx" } },
|
Config { Name = "macosx-clang", DefaultOnHost = "macosx", Inherit = macosx, Tools = { "clang-osx" } },
|
||||||
Config { Name = "win32-msvc", DefaultOnHost = { "windows" }, Inherit = win32, Tools = { "msvc" } },
|
Config { Name = "win32-msvc", DefaultOnHost = { "windows" }, Inherit = win32, Tools = { "msvc" } },
|
||||||
|
Config { Name = "linux-gcc", DefaultOnHost = { "linux" }, Inherit = linux, Tools = { "gcc" } },
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -107,7 +107,10 @@ Program {
|
|||||||
|
|
||||||
Depends = { "sync", "mxml", "emgui" },
|
Depends = { "sync", "mxml", "emgui" },
|
||||||
|
|
||||||
Libs = { { "wsock32.lib", "opengl32.lib", "glu32.lib", "kernel32.lib", "user32.lib", "gdi32.lib", "Comdlg32.lib", "Advapi32.lib" ; Config = "win32-*-*" } },
|
Libs = {
|
||||||
|
{ "wsock32.lib", "opengl32.lib", "glu32.lib", "kernel32.lib", "user32.lib", "gdi32.lib", "Comdlg32.lib", "Advapi32.lib" ; Config = "win32-*-*" },
|
||||||
|
{ "GL", "SDL", "m"; Config = "linux-*-*" }
|
||||||
|
},
|
||||||
|
|
||||||
Frameworks = { "Cocoa", "OpenGL", "Carbon" },
|
Frameworks = { "Cocoa", "OpenGL", "Carbon" },
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user