diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-31 09:24:44 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-31 09:24:44 (GMT) |
| commit | e0c9dab8cb981172c5de81f5963e28db67f1b295 (patch) | |
| tree | dd78e82f54a7ed87915a7d5100437cd42ac0c415 /Makefile | |
| parent | 708d52bcc5f0e13fa6540751e2402ccfdf02bec7 (diff) | |
| download | powder-e0c9dab8cb981172c5de81f5963e28db67f1b295.zip powder-e0c9dab8cb981172c5de81f5963e28db67f1b295.tar.gz | |
Move more SDL dependancies out of program, OpenGLCanvas for JNI and JNI methods.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -18,6 +18,7 @@ powder.exe: build/powder.exe powder-release: build/powder-release powder: build/powder 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 @@ -31,6 +32,8 @@ build/powder: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f #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 build/powder-x: LFLAGS := -lm -lbz2 -lfftw3f -framework SDL -framework Lua -framework Cocoa +build/powder-x.jnilib: CFLAGS += -DMACOSX -DUSE_JNI -I/Library/Frameworks/Lua.framework/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers -DOGLR -DPIX32OGL -DPIXALPHA +build/powder-x.jnilib: LFLAGS := -lm -lbz2 -lfftw3f -framework Lua -framework JavaVM -framework Cocoa -framework OpenGL CFLAGS += -DGRAVFFT -DLUACONSOLE @@ -67,6 +70,14 @@ build/obj/powder-x/%.o: src/%.cpp $(HEADERS) buildpaths-powder-x: $(shell mkdir -p build/obj/powder-x/) $(shell mkdir -p $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder-x/%.o,$(OBJS))))) + +build/powder-x.jnilib: buildpaths-powder-x.jnilib generate $(patsubst build/obj/%.o,build/obj/powder-x.jnilib/%.o,$(OBJS)) + $(CPPC) -dynamiclib $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder-x.jnilib/%.o,$(OBJS)) src/powdertoyjava/OpenGLCanvasMacOS.mm $(LFLAGS) -o $@ -ggdb +build/obj/powder-x.jnilib/%.o: src/%.cpp $(HEADERS) + $(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb +buildpaths-powder-x.jnilib: + $(shell mkdir -p build/obj/powder-x.jnilib/) + $(shell mkdir -p $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder-x.jnilib/%.o,$(OBJS))))) generate: $(GENERATEDSOURCES) touch generate |