summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBryan Hoyle <starfoxprime@gmail.com>2012-06-20 18:23:22 (GMT)
committer Bryan Hoyle <starfoxprime@gmail.com>2012-06-20 18:23:22 (GMT)
commitc9f837f21d7f2324c838891ec0d43cf7feff0cb9 (patch)
tree41e38fcf7f2112da52b67ae9887d9c4fdf9282d8 /Makefile
parent088b2f678d5baedcf3555a5afce76710e6900a9e (diff)
downloadpowder-c9f837f21d7f2324c838891ec0d43cf7feff0cb9.zip
powder-c9f837f21d7f2324c838891ec0d43cf7feff0cb9.tar.gz
Opengl can open saves now, just need to get it to render accurately later
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index cf663f2..01c2e12 100644
--- a/Makefile
+++ b/Makefile
@@ -21,13 +21,13 @@ powder-x: build/powder-x
powder-x.jnilib: build/powder-x.jnilib
build/powder-release.exe: CFLAGS += -DWIN32 -O3 -ftree-vectorize -msse2 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations
-build/powder-release.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua -lfftw3f-3 -mwindows
+build/powder-release.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua5.1 -lfftw3f-3 -mwindows
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 -msse2 -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: CFLAGS += -DLIN32
-build/powder: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f
+build/powder-release: CFLAGS += -DLIN32 -O3 -ftree-vectorize -msse3 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations -I/usr/include/SDL -I/usr/include/lua50 -DOGLR -DPIX32OGL -DPIXALPHA
+build/powder-release: LFLAGS := -lSDL -lm -lbz2 -llua5.1 -lfftw3f -lGL -lGLEW -ggdb
+build/powder: CFLAGS += -DLIN32 -DOGLR -DPIX32OGL -DPIXALPHA -I/usr/include/SDL -I/usr/include/lua50
+build/powder: LFLAGS := -lSDL -lm -lbz2 -llua5.1 -lfftw3f -lGL -lGLEW -ggdb
#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
#build/powder-x: LFLAGS := -lm -lbz2 -lfftw3f -framework SDL -framework Lua -framework Cocoa -framework OpenGL
build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -DPIX32BGRA
@@ -45,7 +45,6 @@ build/powder-res.o: resources/powder-res.rc resources/powder.ico resources/docum
mv resources/powder-res.o build/powder-res.o
build/powder-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