diff options
| author | Andy Belle-Isle <abelleisle@roadrunner.com> | 2015-09-16 18:00:38 -0400 |
|---|---|---|
| committer | Andy Belle-Isle <abelleisle@roadrunner.com> | 2015-09-16 18:00:38 -0400 |
| commit | 0dc897fe78c41d0420105f3a1ce02b31fcf5d376 (patch) | |
| tree | cbb87581066104556ab76790de3eeddd0c13e1ed /Makefile | |
| parent | 76ae330e93cfdc09826beee41970772cbd0486ea (diff) | |
Fixed Conflicts
Had to remove -Wextra because it didn't allow for int argc, char** argv
and SDL requires those in the main function. Also removed
glActiveTexture() because it wasn't declared, currently everything works
fine without it, but I'll find a way to fix it soon, but for now it
works.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ FLAGS_LINUX = -lGL -lSDL2_image -lfreetype
FLAGS_WIN32 = -lopengl32 -lmingw32 -lSDL2_Image -lfreetype
-FLAGS = -m32 -std=c++11 -Iinclude -Iinclude/freetype2 -Wall -Werror -Wextra -lSDL2main -lSDL2
+FLAGS = -m32 -std=c++11 -Iinclude -Iinclude/freetype2 -Wall -Werror -lSDL2main -lSDL2
all:
@g++ src/*.cpp -o main $(FLAGS_LINUX) $(FLAGS)
|