summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBryan Hoyle <starfoxprime@gmail.com>2012-06-20 19:05:25 (GMT)
committer Bryan Hoyle <starfoxprime@gmail.com>2012-06-20 19:05:25 (GMT)
commit3b29a7476721627e66c296db9814840969f639b9 (patch)
tree1e2699b5874fabf52f22fab0d0f67605fecdb20b /Makefile
parentb6afd854d051daa16e3c99ab5e2d639ecf79f8a2 (diff)
downloadpowder-3b29a7476721627e66c296db9814840969f639b9.zip
powder-3b29a7476721627e66c296db9814840969f639b9.tar.gz
fixes to code and a option for opengl building for release
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 930c367..af12358 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ all: build/powder
powder-release.exe: build/powder-release.exe
powder.exe: build/powder.exe
powder-release: build/powder-release
+powder-opengl-release: build/powder-opengl-release
powder: build/powder
powder-x: build/powder-x
powder-x.jnilib: build/powder-x.jnilib
@@ -26,6 +27,8 @@ build/powder.exe: CFLAGS += -DWIN32
build/powder.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua -lfftw3f-3 #-mwindows
build/powder-release: CFLAGS += -DLIN32 -O3 -ftree-vectorize -msse3 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations
build/powder-release: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f
+build/powder-opengl-release: CFLAGS += -DLIN32 -O3 -ftree-vectorize -msse3 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations -DOGLR -DPIX32OGL -DPIXALPHA
+build/powder-opengl-release: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f -lGL -lGLEW -DOGLR -DPIX32OGL -DPIXALPHA
build/powder: CFLAGS += -DLIN32
build/powder: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f
#build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -I/Library/Frameworks/OpenGL.framework/Headers -DOGLR -DPIX32OGL -DPIXALPHA
@@ -46,6 +49,9 @@ build/powder-res.o: resources/powder-res.rc resources/powder.ico resources/docum
build/powder-release: $(SOURCES)
$(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) -o $@
strip $@
+build/powder-opengl-release: $(SOURCES)
+ $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) -o $@
+ strip $@
build/powder.exe: buildpaths-powder.exe generate $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o
$(CPPC_WIN) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o $(LFLAGS) -o $@ -ggdb
build/obj/powder.exe/%.o: src/%.cpp $(HEADERS)