summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-09-03 09:32:37 (GMT)
committer Simon <simon@hardwired.org.uk>2010-09-03 09:32:37 (GMT)
commit2f0d0f5d92312fc02dc34d30f99b7cdeb09eccc9 (patch)
tree4a6c5cbb8f3b3428b634cae04bad675e47c997fa /Makefile
parent5fef47a1c213870754f2f11ead0ab142400cdb41 (diff)
downloadpowder-2f0d0f5d92312fc02dc34d30f99b7cdeb09eccc9.zip
powder-2f0d0f5d92312fc02dc34d30f99b7cdeb09eccc9.tar.gz
Fix for Linux building
Diffstat (limited to 'Makefile')
-rwxr-xr-xMakefile43
1 files changed, 5 insertions, 38 deletions
diff --git a/Makefile b/Makefile
index 1e1860a..38608b3 100755
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,10 @@ HEADERS := font.h hmap.h http.h md5.h icon.h update.h version.h
CFLAGS := -Wall -std=c99 -D_POSIX_C_SOURCE=200112L
OFLAGS := -O3 -ffast-math -ftree-vectorize -funsafe-math-optimizations
LFLAGS := -lSDL -lm -lbz2
-LFLAGS_MTW32 := -lpthreadGC2
-LFLAGS_MT := $(LFLAGS) -lpthread
-MFLAGS_MT := -march=k8 -DX86 -DX86_SSE3 -DMT -msse3
MFLAGS_SSE3 := -march=k8 -DX86 -DX86_SSE3 -msse3
MFLAGS_SSE2 := -march=k8 -DX86 -DX86_SSE2 -msse2
MFLAGS_SSE := -march=pentium3 -DX86 -DX86_SSE
-FLAGS_DBUG := -Wall -std=c99 -D_POSIX_C_SOURCE=200112L -pg -O2 -march=k8 -DX86 -DX86_SSE3 -msse3 -lSDL -lm -lpthread -lbz2
+FLAGS_DBUG := -Wall -std=c99 -D_POSIX_C_SOURCE=200112L -pg -O2 -march=k8 -DX86 -DX86_SSE3 -msse3 -lSDL -lm -lbz2
COMPILER := gcc
LINUX_TARG := powder-64-sse2 powder-sse powder-sse2
WIN32_TARG := powder-sse.exe powder-sse2.exe
@@ -23,9 +20,6 @@ powder-debug: $(SOURCES) $(HEADERS)
powder-sse3: $(SOURCES) $(HEADERS)
$(COMPILER) -m32 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN32
strip $@
-powder-mt: $(SOURCES) $(HEADERS)
- $(COMPILER) -m32 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS_MT) $(MFLAGS_MT) $(SOURCES) -DLIN32
- strip $@
powder-sse2: $(SOURCES) $(HEADERS)
$(COMPILER) -m32 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE2) $(SOURCES) -DLIN32
strip $@
@@ -47,10 +41,6 @@ powder-sse3.exe: $(SOURCES) $(HEADERS) powder-res.o
i586-mingw32msvc-gcc -o$@ $(CFLAGS) $(OFLAGS) $(MFLAGS_SSE3) $(SOURCES) powder-res.o -lmingw32 -lws2_32 -lSDLmain $(LFLAGS) -mwindows -DWIN32
strip $@
chmod 0644 $@
-powder-mt.exe: $(SOURCES) $(HEADERS) powder-res.o
- i586-mingw32msvc-gcc -o$@ $(CFLAGS) $(OFLAGS) $(MFLAGS_MT) $(SOURCES) powder-res.o -lmingw32 -lws2_32 -lSDLmain $(LFLAGS_MTW32) -mwindows -DWIN32
- strip $@
- chmod 0644 $@
powder-sse2.exe: $(SOURCES) $(HEADERS) powder-res.o
i586-mingw32msvc-gcc -o$@ $(CFLAGS) $(OFLAGS) $(MFLAGS_SSE2) $(SOURCES) powder-res.o -lmingw32 -lws2_32 -lSDLmain $(LFLAGS) -mwindows -DWIN32
strip $@
@@ -59,33 +49,10 @@ powder-sse.exe: $(SOURCES) $(HEADERS) powder-res.o
i586-mingw32msvc-gcc -o$@ $(CFLAGS) $(OFLAGS) $(MFLAGS_SSE) $(SOURCES) powder-res.o -lmingw32 -lws2_32 -lSDLmain $(LFLAGS) -mwindows -DWIN32
strip $@
chmod 0644 $@
+
powder-x: $(SOURCES) $(HEADERS)
gcc -o $@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS) $(SOURCES) -lSDLmain -DMACOSX -DPIX32BGRA -arch x86_64 -framework Cocoa -ggdb
strip $@
-powder-x-mt: $(SOURCES) $(HEADERS)
- gcc -o $@ $(CFLAGS) $(OFLAGS) $(LFLAGS_MT) $(MFLAGS_MT) $(SOURCES) -lSDLmain -DMACOSX -DPIX32BGRA -arch x86_64 -framework Cocoa
-powder-src.tar.bz2: *.c *.h *.rc *.ico Makefile
- mkdir powder-src
- cp *.c *.h *.rc *.ico Makefile powder-src/
- tar cfj powder-src.tar.bz2 powder-src
- rm -rf powder-src
-
-release: $(LINUX_TARG) $(WIN32_TARG) powder-src.tar.bz2
- tar cfz powder-linux.tar.gz $(LINUX_TARG)
- cp /usr/i586-mingw32msvc/bin/SDL.dll ./
- zip powder-win32.zip $(WIN32_TARG) SDL.dll
- mkdir -p release
- mv powder-linux.tar.gz release/
- mv powder-win32.zip release/
- mv powder-src.tar.bz2 release/
- cp powder-sse.exe powder.exe
- rm -f release/powder.zip
- zip release/powder.zip powder.exe SDL.dll
- cp powder-64-sse2 release/powder64
- rm -f release/powder64.gz
- gzip release/powder64
- rm -f release/powder.gz
- cp powder-sse release/powder
- gzip release/powder
- cd release; tar czf powder-bin.tar.gz powder.gz powder64.gz powder-linux.tar.gz powder-win32.zip powder.zip; cd ..
- rm -f $(LINUX_TARG) $(WIN32_TARG) SDL.dll powder.exe
+powder-x-ogl: $(SOURCES) $(HEADERS)
+ gcc -o $@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS) $(SOURCES) -lSDLmain -DOpenGL -DMACOSX -DPIX32BGRA -arch x86_64 -framework Cocoa -framework OpenGL -ggdb
+ strip $@