Fixes to makefile and fixes error in particle_avg function.
This commit is contained in:
Simon
parent
af573753cf
commit
b33438254d
108
Makefile
108
Makefile
@ -1,7 +1,7 @@
|
||||
SOURCES := powder.c http.c md5.c update.c
|
||||
HEADERS := font.h hmap.h http.h md5.h icon.h update.h version.h
|
||||
|
||||
CFLAGS := -Wall -std=c99 -D_POSIX_C_SOURCE=200112L -fgnu89-inline
|
||||
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
|
||||
@ -10,79 +10,81 @@ MFLAGS_MT := -march=k8 -DX86 -DX86_SSE3 -DMT -msse3
|
||||
MFLAGS_SSE3 := -march=k8 -DX86 -DX86_SSE3 -msse3
|
||||
MFLAGS_SSE2 := -march=k8 -DX86 -DX86_SSE2
|
||||
MFLAGS_SSE := -march=pentium3 -DX86 -DX86_SSE
|
||||
|
||||
COMPILER := gcc
|
||||
LINUX_TARG := powder-64-sse2 powder-sse powder-sse2
|
||||
WIN32_TARG := powder-sse.exe powder-sse2.exe
|
||||
|
||||
powder: $(SOURCES) $(HEADERS)
|
||||
gcc -DINTERNAL -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64
|
||||
$(COMPILER) -DINTERNAL -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64
|
||||
|
||||
powder-sse3: $(SOURCES) $(HEADERS)
|
||||
gcc -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)
|
||||
gcc -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)
|
||||
gcc -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)
|
||||
gcc -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)
|
||||
gcc -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64
|
||||
strip $@
|
||||
$(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64
|
||||
powder-64-sse2: $(SOURCES) $(HEADERS)
|
||||
gcc -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
|
||||
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
|
||||
2
powder.c
2
powder.c
@ -1099,7 +1099,7 @@ void set_emap(int x, int y)
|
||||
}
|
||||
int parts_avg(int ci, int ni){
|
||||
int pmr = pmap[(int)((parts[ci].y + parts[ni].y)/2)][(int)((parts[ci].x + parts[ni].x)/2)];
|
||||
return parts[(pmr>>8>=PT_NUM)?PT_NONE:pmr>>8].type;
|
||||
return parts[(pmr>>8>=NPART)?PT_NONE:pmr>>8].type;
|
||||
}
|
||||
int nearest_part(int ci, int t){
|
||||
int distance = sqrt(pow(XRES, 2)+pow(YRES, 2));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user