summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2011-03-22 18:02:22 (GMT)
committer Simon <simon@hardwired.org.uk>2011-03-22 18:02:22 (GMT)
commitefe27b0feeeebc19deede3aee63b1977149a8ca3 (patch)
tree5905bda8c9a25d4ca2b0f19187601cd40c5724c8
parent2e401babb793238564ca640fc802a52ab7f6c293 (diff)
downloadpowder-efe27b0feeeebc19deede3aee63b1977149a8ca3.zip
powder-efe27b0feeeebc19deede3aee63b1977149a8ca3.tar.gz
Fix makefile for OS X
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 4f2c72e..c03e242 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SOURCES := src/*.c src/elements/*.c
CFLAGS := -w -std=c99 -D_POSIX_C_SOURCE=200112L -Iincludes/
OFLAGS := -O3 -ffast-math -ftree-vectorize -funsafe-math-optimizations
LFLAGS := -lSDL -lm -lbz2 -lpython2.7 -L/usr/lib/python2.7/config -I/usr/include/python2.7
-LFLAGS_X := -lm -lbz2 -lSDLmain
+LFLAGS_X := -lm -lbz2 -lSDLmain -I/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
MFLAGS_SSE3 := -march=native -DX86 -DX86_SSE3 -msse3
MFLAGS_SSE2 := -march=native -DX86 -DX86_SSE2 -msse2
MFLAGS_SSE := -march=native -DX86 -DX86_SSE
@@ -81,12 +81,12 @@ powder-sse.exe: $(SOURCES) powder-res.o
chmod 0644 $@
mv $@ build
powder-x: $(SOURCES)
- $(PYCOMMAND)
+ $(PYCOMMAND) --64bit
gcc -o $@ $(CFLAGS) $(OFLAGS) $(LFLAGS_X) $(MFLAGS) $(SOURCES) -DMACOSX -DPIX32BGRA -arch x86_64 -framework Cocoa -framework SDL -framework Python
strip $@
mv $@ build/Powder.app/Contents/MacOS/
powder-x-ogl: $(SOURCES)
- $(PYCOMMAND)
+ $(PYCOMMAND) --64bit
gcc -o $@ $(CFLAGS) $(OFLAGS) $(LFLAGS_X) $(MFLAGS) $(SOURCES) -DOpenGL -DMACOSX -DPIX32BGRA -arch x86_64 -framework Cocoa -framework SDL -framework OpenGL -framework Python
strip $@
mv $@ build