summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-08-11 12:48:32 (GMT)
committer Simon <simon@hardwired.org.uk>2010-08-11 12:48:32 (GMT)
commitab8f1ff8edcba965acfab6554daf5b41ab5aa457 (patch)
treeac8a8f0cb3f4d6ca12ce264f581edf7c53f72948 /Makefile
parentb33438254d78377f10ccd10a10db590c80807962 (diff)
downloadpowder-ab8f1ff8edcba965acfab6554daf5b41ab5aa457.zip
powder-ab8f1ff8edcba965acfab6554daf5b41ab5aa457.tar.gz
Fix makefile
Diffstat (limited to 'Makefile')
-rwxr-xr-xMakefile104
1 files changed, 51 insertions, 53 deletions
diff --git a/Makefile b/Makefile
index 3ea7ded..9d8360f 100755
--- a/Makefile
+++ b/Makefile
@@ -15,76 +15,74 @@ LINUX_TARG := powder-64-sse2 powder-sse powder-sse2
WIN32_TARG := powder-sse.exe powder-sse2.exe
powder: $(SOURCES) $(HEADERS)
- $(COMPILER) -DINTERNAL -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64
+ $(COMPILER) -DINTERNAL -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64
powder-sse3: $(SOURCES) $(HEADERS)
- $(COMPILER) -m32 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN32
- strip $@
+ $(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 $@
+ $(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 $@
+ $(COMPILER) -m32 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE2) $(SOURCES) -DLIN32
+ strip $@
powder-sse: $(SOURCES) $(HEADERS)
- $(COMPILER) -m32 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE) $(SOURCES) -DLIN32
- strip $@
+ $(COMPILER) -m32 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE) $(SOURCES) -DLIN32
+ strip $@
powder-64-sse3: $(SOURCES) $(HEADERS)
- $(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64
+ $(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64
+ strip $@
powder-64-sse2: $(SOURCES) $(HEADERS)
- $(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE2) $(SOURCES) -DLIN64
- strip $@
+ $(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE2) $(SOURCES) -DLIN64
+ strip $@
powder-res.o: powder-res.rc powder.ico
- i586-mingw32msvc-windres powder-res.rc powder-res.o
+ i586-mingw32msvc-windres powder-res.rc powder-res.o
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 $@
+ 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 $@
+ 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 $@
- chmod 0644 $@
+ i586-mingw32msvc-gcc -o$@ $(CFLAGS) $(OFLAGS) $(MFLAGS_SSE2) $(SOURCES) powder-res.o -lmingw32 -lws2_32 -lSDLmain $(LFLAGS) -mwindows -DWIN32
+ strip $@
+ chmod 0644 $@
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 $@
+ 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
- strip $@
+ gcc -o $@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS) $(SOURCES) -lSDLmain -DMACOSX -DPIX32BGRA -arch x86_64 -framework Cocoa
+ strip $@
powder-x-mt: $(SOURCES) $(HEADERS)
- gcc -o $@ $(CFLAGS) $(OFLAGS) $(LFLAGS_MT) $(MFLAGS_MT) $(SOURCES) -lSDLmain -DMACOSX -DPIX32BGRA -arch x86_64 -framework Cocoa
+ 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
+ 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 \ No newline at end of file
+ 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 \ No newline at end of file