diff options
| author | Andy Belle-Isle <abelleisle@roadrunner.com> | 2015-09-10 11:51:56 -0400 |
|---|---|---|
| committer | Andy Belle-Isle <abelleisle@roadrunner.com> | 2015-09-10 11:51:56 -0400 |
| commit | 22fd8623af3f57c4e28f43f793bae4d14948abc0 (patch) | |
| tree | c4936680f4cffd0d52e4d96aed39404fdaa30a52 /Makefile | |
| parent | dfb65f04b8579c9c4e24086452474adcae9b87b7 (diff) | |
| parent | a3db993224c994fdff6f50fedcc266c5e0b94aa8 (diff) | |
Merge remote-tracking branch 'origin/master'
d
Conflicts:
include/World.h
include/common.h
include/entities.h
src/UIClass.cpp
src/World.cpp
src/entities.cpp
src/main.cpp
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -1,12 +1,12 @@ -FLAGS_LINUX = -lGL -lSDL2_image -FLAGS_WIN32 = -lopengl32 -lmingw32 -lSDL2_Image -FLAGS = -m32 -Iinclude -Wall -Werror -lSDL2main -lSDL2 - -all: - @g++ src/*.cpp -o main $(FLAGS_LINUX) $(FLAGS) - -win32: - @g++ -L lib/ src/*.cpp -o main.exe $(FLAGS_WIN32) $(FLAGS) - -clean: - rm main* +FLAGS_LINUX = -lGL -lSDL2_image
+FLAGS_WIN32 = -lopengl32 -lmingw32 -lSDL2_Image
+FLAGS = -m32 -Iinclude -Wall -Werror -lSDL2main -lSDL2
+
+all:
+ @g++ src/*.cpp -o main $(FLAGS_LINUX) $(FLAGS)
+
+win32:
+ @g++ -L lib/ src/*.cpp -o main.exe $(FLAGS_WIN32) $(FLAGS)
+
+clean:
+ rm main*
|