summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SConstruct6
-rw-r--r--engine/SDLMain.h (renamed from SDLMain.h)0
-rw-r--r--engine/SDLMain.m (renamed from SDLMain.m)0
-rw-r--r--engine/application.cpp (renamed from application.cpp)0
-rw-r--r--engine/application.h (renamed from application.h)0
-rw-r--r--engine/bulletpattern.cpp (renamed from bulletpattern.cpp)0
-rw-r--r--engine/bulletpattern.h (renamed from bulletpattern.h)0
-rw-r--r--engine/config.h (renamed from config.h)0
-rw-r--r--engine/player.cpp (renamed from player.cpp)0
-rw-r--r--engine/player.h (renamed from player.h)0
-rw-r--r--engine/shader.cpp (renamed from shader.cpp)0
-rw-r--r--engine/shader.h (renamed from shader.h)0
-rw-r--r--engine/texture.cpp (renamed from texture.cpp)0
-rw-r--r--engine/texture.h (renamed from texture.h)0
-rw-r--r--engine/texturesdl.cpp (renamed from texturesdl.cpp)0
-rw-r--r--engine/texturesdl.h (renamed from texturesdl.h)0
-rw-r--r--engine/vector.cpp (renamed from vector.cpp)0
-rw-r--r--engine/vector.h (renamed from vector.h)0
-rw-r--r--main.cpp2
19 files changed, 4 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 7cc4dc2..1e7e66e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -4,7 +4,7 @@ env = Environment(
ENV = os.environ,
)
-common_sources = []
+engine = Glob('engine/*.cpp')
AddOption('--release', action = 'store_true')
@@ -15,7 +15,7 @@ if env['PLATFORM'] == 'darwin':
env.Append(LIBS = ['ftgl'])
env.Append(LIBPATH = ['/opt/local/lib'])
env.Append(FRAMEWORKS = ['SDL', 'SDL_image', 'Cocoa', 'OpenGL', 'AppKit'])
- common_sources.append('SDLMain.m')
+ engine.append('engine/SDLMain.m')
else:
env.Append(LIBS = ['GL', 'GLU', 'SDL', 'SDL_image'])
env.ParseConfig('sdl-config --cflags --libs')
@@ -24,6 +24,6 @@ else:
if not GetOption('release'):
env.Append(CPPFLAGS = ['-Wall', '-g'])
-env.Program('foo', common_sources + Glob('*.cpp'))
+env.Program('foo', ['main.cpp'] + engine)
# vim: syn=python
diff --git a/SDLMain.h b/engine/SDLMain.h
index 4683df5..4683df5 100644
--- a/SDLMain.h
+++ b/engine/SDLMain.h
diff --git a/SDLMain.m b/engine/SDLMain.m
index 122fcc8..122fcc8 100644
--- a/SDLMain.m
+++ b/engine/SDLMain.m
diff --git a/application.cpp b/engine/application.cpp
index 2ef8e79..2ef8e79 100644
--- a/application.cpp
+++ b/engine/application.cpp
diff --git a/application.h b/engine/application.h
index 4bf9251..4bf9251 100644
--- a/application.h
+++ b/engine/application.h
diff --git a/bulletpattern.cpp b/engine/bulletpattern.cpp
index b4b5a31..b4b5a31 100644
--- a/bulletpattern.cpp
+++ b/engine/bulletpattern.cpp
diff --git a/bulletpattern.h b/engine/bulletpattern.h
index 092713e..092713e 100644
--- a/bulletpattern.h
+++ b/engine/bulletpattern.h
diff --git a/config.h b/engine/config.h
index 6884b1a..6884b1a 100644
--- a/config.h
+++ b/engine/config.h
diff --git a/player.cpp b/engine/player.cpp
index 4a159ca..4a159ca 100644
--- a/player.cpp
+++ b/engine/player.cpp
diff --git a/player.h b/engine/player.h
index 41f1928..41f1928 100644
--- a/player.h
+++ b/engine/player.h
diff --git a/shader.cpp b/engine/shader.cpp
index 04aa031..04aa031 100644
--- a/shader.cpp
+++ b/engine/shader.cpp
diff --git a/shader.h b/engine/shader.h
index 012165a..012165a 100644
--- a/shader.h
+++ b/engine/shader.h
diff --git a/texture.cpp b/engine/texture.cpp
index ca9d8e7..ca9d8e7 100644
--- a/texture.cpp
+++ b/engine/texture.cpp
diff --git a/texture.h b/engine/texture.h
index 14e500f..14e500f 100644
--- a/texture.h
+++ b/engine/texture.h
diff --git a/texturesdl.cpp b/engine/texturesdl.cpp
index 8e112ef..8e112ef 100644
--- a/texturesdl.cpp
+++ b/engine/texturesdl.cpp
diff --git a/texturesdl.h b/engine/texturesdl.h
index 6b2eff2..6b2eff2 100644
--- a/texturesdl.h
+++ b/engine/texturesdl.h
diff --git a/vector.cpp b/engine/vector.cpp
index f2ce8d7..f2ce8d7 100644
--- a/vector.cpp
+++ b/engine/vector.cpp
diff --git a/vector.h b/engine/vector.h
index 3c590c3..3c590c3 100644
--- a/vector.h
+++ b/engine/vector.h
diff --git a/main.cpp b/main.cpp
index 19a4059..679b7eb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,7 +1,7 @@
#include <iostream>
#include <stdexcept>
-#include "application.h"
+#include "engine/application.h"
int main(int, char**) {
try {