diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-20 12:40:34 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-20 12:40:34 (GMT) |
| commit | e81e18238df47212d84fa00422a64983857e1ea1 (patch) | |
| tree | 67c973f1f3666f9f4b230524575cda5dd6cc4cd6 /Makefile | |
| parent | 2be9c925088c16beb144dd9932202416d00ff581 (diff) | |
| parent | f6403958de1f67d3bce47f56b40de254c30f5ba4 (diff) | |
| download | powder-e81e18238df47212d84fa00422a64983857e1ea1.zip powder-e81e18238df47212d84fa00422a64983857e1ea1.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/PowderToypp
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -35,7 +35,7 @@ build/powder-x: LFLAGS := -lm -lbz2 -lfftw3f -framework SDL -framework Lua -fram 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 +CFLAGS += -DGRAVFFT -DLUACONSOLE -DUSE_SDL build/powder-release.exe: $(SOURCES) generate build/powder-res.o $(CPPC_WIN) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) build/powder-res.o -o $@ |