aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-09-08 18:29:24 -0400
committerClyne Sullivan <tullivan99@gmail.com>2015-09-08 18:29:24 -0400
commitf135a4a380b5ea56a876dcfef1448e01f1bebdec (patch)
tree0519d8e3507f2b439ef220413e10fca37fcd6971 /Makefile
parent9e842f5cb8a2ab5f3774333bfa868e9982ec4bd6 (diff)
parent2a0df74f8a73427b1fe2b96ec7840e7f39178569 (diff)
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 13a7119..083b86b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@ FLAGS_WIN32 = -lopengl32 -lmingw32 #-lSDL2_Image
FLAGS = -m32 -Iinclude -Wall -Werror -lSDL2main -lSDL2
all:
- @g++ src/main.cpp src/UIClass.cpp src/Quest.cpp -o main $(FLAGS_LINUX) $(FLAGS)
+ @g++ src/main.cpp src/UIClass.cpp src/windowClass.cpp src/Quest.cpp -o main $(FLAGS_LINUX) $(FLAGS)
win32:
- @g++ -L lib/ src/main.cpp src/UIClass.cpp -o main.exe $(FLAGS_WIN32) $(FLAGS)
+ @g++ -L lib/ src/main.cpp src/UIClass.cpp src/windowClass.cpp src/Quest.cpp -o main.exe $(FLAGS_WIN32) $(FLAGS)
clean:
rm main*