Merge branch 'master' of https://github.com/simtr/The-Powder-Toy

The-Powder-Toy · Jul 17, 2016 · 85bdeae · 85bdeae
2 parents 3b106b7 + 0c97246
commit 85bdeae
Show file tree

Hide file tree

Showing 17 changed files with 958 additions and 295 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ Saves/*
 scripts/*
 generated/*
 includes/*
+font/*
 generate
 Makefile.me
 *.xcodeproj

diff --git a/data/font.h b/data/font.h
diff --git a/font/Makefile b/font/Makefile
@@ -0,0 +1,21 @@
+
+editor: editor.c
+	gcc -oeditor -DSCALE=1 -DFONTEDITOR editor.c -lSDL -lm -O3 -ffast-math -march=k8
+
+editor.exe: editor.c
+	i686-w64-mingw32-gcc -oeditor.exe -DSCALE=1 -DFONTEDITOR editor.c -lmingw32 -lm -lSDLmain -lSDL -O3 -ffast-math -march=k8 -mwindows
+
+packer: packer.c
+	gcc -opacker -DFONTEDITOR packer.c -lm -O3 -ffast-math -march=k8
+
+packer.exe: packer.c
+	i686-w64-mingw32-gcc -opacker.exe -DFONTEDITOR packer.c -lm -O3 -ffast-math -march=k8
+
+unpacker: unpacker.c
+	gcc -ounpacker -DFONTEDITOR unpacker.c -lm -O3 -ffast-math -march=k8
+
+unpacker.exe: unpacker.c
+	i686-w64-mingw32-gcc -ounpacker.exe -DFONTEDITOR unpacker.c -lm -O3 -ffast-math -march=k8
+
+clean:
+	rm -f editor packer unpacker editor.exe packer.exe unpacker.exe