From 159027169185ed8d085a58db3a09a50af556fc28 Mon Sep 17 00:00:00 2001
From: andrew kesterson <andrew@aklabs.net>
Date: Tue, 21 Jun 2011 21:26:27 +0000
Subject: [PATCH] Got dependencies building on linux and mingw32; Got library
 building on linux again, as well as all demos; Got backtrace working in linux
 (currently the output is a little mangled, need to run it through addr2line
 to get file and line info out of it and demangle it)

---
 Makefile                            |   7 ++-
 demo/backtrace/Makefile             |   3 +-
 demo/bouncingball/Makefile          |   3 +-
 demo/exploder/Makefile              |   3 +-
 demo/explodingball/Makefile         |   3 +-
 demo/frictionball/Makefile          |   3 +-
 demo/frictionball/gmon.out          | Bin 198176 -> 64322 bytes
 demo/gravity/Makefile               |   3 +-
 demo/gravity/gmon.out               | Bin 197928 -> 52884 bytes
 demo/helloworld/Makefile            |   3 +-
 demo/tilemap/Makefile               |   3 +-
 deps/Makefile.apt                   |  65 ++++++++++++++++++++++++++++
 deps/{Makefile => Makefile.mingw32} |   2 +-
 libsdlgame/Backtrace.cpp            |  32 +++++++-------
 14 files changed, 103 insertions(+), 27 deletions(-)
 create mode 100755 deps/Makefile.apt
 rename deps/{Makefile => Makefile.mingw32} (99%)

diff --git a/Makefile b/Makefile
index 416b58a..12a03f3 100755
--- a/Makefile
+++ b/Makefile
@@ -24,14 +24,18 @@ ifeq "$(OS)" "mingw32"
 	ADDL_CFLAGS=-rdynamic -mwindows -DOS_WIN32
 	EXESUFFIX=.exe
 	LIBSUFFIX=.a
+	DEPMAKEFILE=Makefile.mingw32
 endif
 
 ifeq "$(OS)" "macosx"
 	ADDL_CFLAGS=-rdynamic -DOS_MACOSX
+	DEPMAKEFILE=Makefile.macosx
 endif
 
 ifeq "$(OS)" "linux"
 	ADDL_CFLAGS=-rdynamic -DOS_LINUX
+	DEPMAKEFILE=Makefile.apt
+	LIBSUFFIX=.a
 endif
 
 ifeq "$(CFG)" "Debug"
@@ -101,6 +105,7 @@ clean:
 	rm -f $(OUTDIR)/$(LIBTARGET).*
 	rm -rf docs/*
 	cd demo && for dir in $(DEMOS); do cd $$dir && make CFG=$(CFG) OS=$(OS) clean; if [ $$? -ne 0 ]; then exit 1 ; fi; cd .. ; done
+
 .PHONY: demos
 demos:
 	cd demo && for dir in $(DEMOS); do cd $$dir && make "ADDL_CFLAGS=$(ADDL_CFLAGS)" CFG=$(CFG) OS=$(OS); if [ $$? -ne 0 ]; then exit 1 ; fi; cd .. ; done
@@ -124,4 +129,4 @@ uninstall:
 
 .PHONY: deps
 deps:
-	cd deps && make
\ No newline at end of file
+	cd deps && make -f $(DEPMAKEFILE)
diff --git a/demo/backtrace/Makefile b/demo/backtrace/Makefile
index 7dd2271..11f1cef 100755
--- a/demo/backtrace/Makefile
+++ b/demo/backtrace/Makefile
@@ -25,6 +25,7 @@ ifeq "$(OS)" "mingw32"
 endif
 ifeq "$(OS)" "linux"
 	ADDL_CFLAGS=-DBUILD_LINUX -rdynamic
+	ADDL_LDFLAGS=-rdynamic
 endif 
 
 # default for release configs
@@ -49,7 +50,7 @@ ifeq "$(CFG)" "Debug"
 	CXXFLAGS=-I../../ -I$(HEADERDIR) -I./cpp  -pg -g -ggdb -gstabs -Wall -c $(SDL_CFLAGS) $(ADDL_CFLAGS)
 endif
 
-LINKLIBS=-L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
+LINKLIBS=$(ADDL_LDFLAGS) -L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
 
 BINOBJ=$(OUTDIR)/demo.o
 
diff --git a/demo/bouncingball/Makefile b/demo/bouncingball/Makefile
index 7dd2271..11f1cef 100755
--- a/demo/bouncingball/Makefile
+++ b/demo/bouncingball/Makefile
@@ -25,6 +25,7 @@ ifeq "$(OS)" "mingw32"
 endif
 ifeq "$(OS)" "linux"
 	ADDL_CFLAGS=-DBUILD_LINUX -rdynamic
+	ADDL_LDFLAGS=-rdynamic
 endif 
 
 # default for release configs
@@ -49,7 +50,7 @@ ifeq "$(CFG)" "Debug"
 	CXXFLAGS=-I../../ -I$(HEADERDIR) -I./cpp  -pg -g -ggdb -gstabs -Wall -c $(SDL_CFLAGS) $(ADDL_CFLAGS)
 endif
 
-LINKLIBS=-L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
+LINKLIBS=$(ADDL_LDFLAGS) -L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
 
 BINOBJ=$(OUTDIR)/demo.o
 
diff --git a/demo/exploder/Makefile b/demo/exploder/Makefile
index 7dd2271..11f1cef 100755
--- a/demo/exploder/Makefile
+++ b/demo/exploder/Makefile
@@ -25,6 +25,7 @@ ifeq "$(OS)" "mingw32"
 endif
 ifeq "$(OS)" "linux"
 	ADDL_CFLAGS=-DBUILD_LINUX -rdynamic
+	ADDL_LDFLAGS=-rdynamic
 endif 
 
 # default for release configs
@@ -49,7 +50,7 @@ ifeq "$(CFG)" "Debug"
 	CXXFLAGS=-I../../ -I$(HEADERDIR) -I./cpp  -pg -g -ggdb -gstabs -Wall -c $(SDL_CFLAGS) $(ADDL_CFLAGS)
 endif
 
-LINKLIBS=-L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
+LINKLIBS=$(ADDL_LDFLAGS) -L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
 
 BINOBJ=$(OUTDIR)/demo.o
 
diff --git a/demo/explodingball/Makefile b/demo/explodingball/Makefile
index 7dd2271..11f1cef 100755
--- a/demo/explodingball/Makefile
+++ b/demo/explodingball/Makefile
@@ -25,6 +25,7 @@ ifeq "$(OS)" "mingw32"
 endif
 ifeq "$(OS)" "linux"
 	ADDL_CFLAGS=-DBUILD_LINUX -rdynamic
+	ADDL_LDFLAGS=-rdynamic
 endif 
 
 # default for release configs
@@ -49,7 +50,7 @@ ifeq "$(CFG)" "Debug"
 	CXXFLAGS=-I../../ -I$(HEADERDIR) -I./cpp  -pg -g -ggdb -gstabs -Wall -c $(SDL_CFLAGS) $(ADDL_CFLAGS)
 endif
 
-LINKLIBS=-L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
+LINKLIBS=$(ADDL_LDFLAGS) -L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
 
 BINOBJ=$(OUTDIR)/demo.o
 
diff --git a/demo/frictionball/Makefile b/demo/frictionball/Makefile
index 7dd2271..11f1cef 100755
--- a/demo/frictionball/Makefile
+++ b/demo/frictionball/Makefile
@@ -25,6 +25,7 @@ ifeq "$(OS)" "mingw32"
 endif
 ifeq "$(OS)" "linux"
 	ADDL_CFLAGS=-DBUILD_LINUX -rdynamic
+	ADDL_LDFLAGS=-rdynamic
 endif 
 
 # default for release configs
@@ -49,7 +50,7 @@ ifeq "$(CFG)" "Debug"
 	CXXFLAGS=-I../../ -I$(HEADERDIR) -I./cpp  -pg -g -ggdb -gstabs -Wall -c $(SDL_CFLAGS) $(ADDL_CFLAGS)
 endif
 
-LINKLIBS=-L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
+LINKLIBS=$(ADDL_LDFLAGS) -L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
 
 BINOBJ=$(OUTDIR)/demo.o
 
diff --git a/demo/frictionball/gmon.out b/demo/frictionball/gmon.out
index c282fa7e77eecb28a5cd8f6c8d707c20916f25c5..2183aef6353061d05d58d46e032d0ed161bea90b 100755
GIT binary patch
literal 64322
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
N;w4=6I8J`9{BOM?pmzWO

literal 198176
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

diff --git a/demo/gravity/Makefile b/demo/gravity/Makefile
index 7dd2271..11f1cef 100755
--- a/demo/gravity/Makefile
+++ b/demo/gravity/Makefile
@@ -25,6 +25,7 @@ ifeq "$(OS)" "mingw32"
 endif
 ifeq "$(OS)" "linux"
 	ADDL_CFLAGS=-DBUILD_LINUX -rdynamic
+	ADDL_LDFLAGS=-rdynamic
 endif 
 
 # default for release configs
@@ -49,7 +50,7 @@ ifeq "$(CFG)" "Debug"
 	CXXFLAGS=-I../../ -I$(HEADERDIR) -I./cpp  -pg -g -ggdb -gstabs -Wall -c $(SDL_CFLAGS) $(ADDL_CFLAGS)
 endif
 
-LINKLIBS=-L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
+LINKLIBS=$(ADDL_LDFLAGS) -L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
 
 BINOBJ=$(OUTDIR)/demo.o
 
diff --git a/demo/gravity/gmon.out b/demo/gravity/gmon.out
index 9e3adab383ffa03ecfa3d49450b549b4fbbc81e3..fabb659d8faa2144d3eaf1d310304141c3dcaa53 100755
GIT binary patch
literal 52884
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

literal 197928
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

diff --git a/demo/helloworld/Makefile b/demo/helloworld/Makefile
index 7dd2271..11f1cef 100755
--- a/demo/helloworld/Makefile
+++ b/demo/helloworld/Makefile
@@ -25,6 +25,7 @@ ifeq "$(OS)" "mingw32"
 endif
 ifeq "$(OS)" "linux"
 	ADDL_CFLAGS=-DBUILD_LINUX -rdynamic
+	ADDL_LDFLAGS=-rdynamic
 endif 
 
 # default for release configs
@@ -49,7 +50,7 @@ ifeq "$(CFG)" "Debug"
 	CXXFLAGS=-I../../ -I$(HEADERDIR) -I./cpp  -pg -g -ggdb -gstabs -Wall -c $(SDL_CFLAGS) $(ADDL_CFLAGS)
 endif
 
-LINKLIBS=-L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
+LINKLIBS=$(ADDL_LDFLAGS) -L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
 
 BINOBJ=$(OUTDIR)/demo.o
 
diff --git a/demo/tilemap/Makefile b/demo/tilemap/Makefile
index 7dd2271..11f1cef 100755
--- a/demo/tilemap/Makefile
+++ b/demo/tilemap/Makefile
@@ -25,6 +25,7 @@ ifeq "$(OS)" "mingw32"
 endif
 ifeq "$(OS)" "linux"
 	ADDL_CFLAGS=-DBUILD_LINUX -rdynamic
+	ADDL_LDFLAGS=-rdynamic
 endif 
 
 # default for release configs
@@ -49,7 +50,7 @@ ifeq "$(CFG)" "Debug"
 	CXXFLAGS=-I../../ -I$(HEADERDIR) -I./cpp  -pg -g -ggdb -gstabs -Wall -c $(SDL_CFLAGS) $(ADDL_CFLAGS)
 endif
 
-LINKLIBS=-L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
+LINKLIBS=$(ADDL_LDFLAGS) -L../../$(CFG) -L$(LIBDIR) -l$(LINKLIB) $(SDL_LDFLAGS) -lSDL_image -lSDL_mixer -lSDL_gfx -lSDL_ttf
 
 BINOBJ=$(OUTDIR)/demo.o
 
diff --git a/deps/Makefile.apt b/deps/Makefile.apt
new file mode 100755
index 0000000..5e8679c
--- /dev/null
+++ b/deps/Makefile.apt
@@ -0,0 +1,65 @@
+all: clean packages
+#all: packages
+
+#
+.PHONY: packages
+packages: SDL SDL_image SDL_mixer SDL_ttf SDL_gfx libxml2 cmake yasm ffmpeg SDL_ffmpeg yaml-cpp
+
+.PHONY: SDL
+SDL:
+	sudo apt-get install libsdl-dev
+
+.PHONY:
+SDL_image:
+	sudo apt-get install libsdl-image1.2-dev
+
+.PHONY: SDL_mixer
+SDL_mixer:
+	sudo apt-get install libsdl-mixer1.2-dev
+
+.PHONY: SDL_ttf
+SDL_ttf:
+	sudo apt-get install libsdl-ttf2.0-dev
+
+.PHONY: SDL_gfx
+SDL_gfx:
+	sudo apt-get install libsdl-gfx1.2-dev
+
+.PHONY: cmake
+cmake:
+	sudo apt-get install cmake
+
+.PHONY: yasm
+yasm:
+	sudo apt-get install yasm
+
+.PHONY: ffmpeg
+ffmpeg:
+	wget http://www.ffmpeg.org/releases/ffmpeg-0.7-rc1.tar.gz
+	tar -zxvf ffmpeg-0.7-rc1.tar.gz
+	cd ffmpeg-0.7-rc1 && ./configure $(FFMPEG_CONFIGURE_FLAGS) && make && make install
+
+.PHONY: SDL_ffmpeg
+SDL_ffmpeg:
+	wget http://www.arjanhouben.nl/SDL_ffmpeg/1.3.1/SDL_ffmpeg-1.3.1.tar.gz
+	tar -zxvf SDL_ffmpeg-1.3.1.tar.gz
+	cd SDL_ffmpeg && cmake -G "MSYS Makefiles" . && make
+	cp SDL_ffmpeg/lib/libSDL_ffmpeg.dll.a /usr/local/lib/
+	cp SDL_ffmpeg/include/SDL/SDL_ffmpeg.h /usr/local/include
+
+.PHONY: yaml-cpp
+yaml-cpp:
+	wget http://yaml-cpp.googlecode.com/files/yaml-cpp-0.2.6.tar.gz
+	tar -zxvf yaml-cpp-0.2.6.tar.gz
+	cd yaml-cpp && cmake -G "MSYS Makefiles" . && make
+	cp -vR yaml-cpp/include/yaml-cpp /usr/local/include/
+	cp yaml-cpp/libyaml-cpp.a /usr/local/lib/
+
+.PHONY: libxml2
+libxml2:
+	sudo apt-get install libxml2-dev
+
+.PHONY: clean
+clean:	
+	rm -rf *gz *zip *bz2
+	find . -maxdepth 1 -type d -iname "[a-zA-Z0-9]*" -exec rm -rf \{\} \;
\ No newline at end of file
diff --git a/deps/Makefile b/deps/Makefile.mingw32
similarity index 99%
rename from deps/Makefile
rename to deps/Makefile.mingw32
index 14dd74f..2e53b03 100755
--- a/deps/Makefile
+++ b/deps/Makefile.mingw32
@@ -4,7 +4,7 @@ CFLAGS=$(CFLAGS) -I/usr/local/include -I/usr/include
 LDFLAGS=$(LDFLAGS) -L/usr/local/lib -L/usr/lib
 
 .PHONY: packages
-packages: SDL zlib libpng libjpeg libtiff SDL_image libvorbis flac SDL_mixer freetype SDL_ttf SDL_gfx libxml2 cmake ffmpeg SDL_ffmpeg backtrace
+packages: SDL zlib libpng libjpeg libtiff SDL_image libvorbis flac SDL_mixer freetype SDL_ttf SDL_gfx libxml2 cmake ffmpeg SDL_ffmpeg backtrace yaml-cpp
 
 .PHONY: SDL
 SDL:
diff --git a/libsdlgame/Backtrace.cpp b/libsdlgame/Backtrace.cpp
index f34fbf4..c427089 100755
--- a/libsdlgame/Backtrace.cpp
+++ b/libsdlgame/Backtrace.cpp
@@ -2,23 +2,7 @@
 #include <windows.h>
 #endif
 
-#include <stdlib.h>
-#include <iostream>
-
-void RegisterStacktrace()
-{
-#ifdef __WIN32__
-  if ( LoadLibraryA("backtrace.dll") == NULL ) {
-    std::cerr << "Unable to locate backtrace.dll.\n";
-    exit(1);
-  }
-#else
-  signal(SIGSEGV, &__libsdlgame_sigsegvhandler);
-#endif
-}
-
 #ifndef __WIN32__
-
 #include <execinfo.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -54,7 +38,7 @@ void __libsdlgame_show_stacktrace (void)
 void __libsdlgame_sigsegvhandler(int z)
 {
   fprintf(stderr, "Caught segmentation fault; stacktrace follows.\n");
-  print_trace();
+  __libsdlgame_show_stacktrace();
 #ifdef DEBUG_LOOPONSEGFAULT
   fprintf(stderr, "Entering infinite loop; please connect a debugger to me and then kill me.\n");
   fflush(stderr);
@@ -65,3 +49,17 @@ void __libsdlgame_sigsegvhandler(int z)
 
 #endif
 
+#include <stdlib.h>
+#include <iostream>
+
+void RegisterStacktrace()
+{
+#ifdef __WIN32__
+  if ( LoadLibraryA("backtrace.dll") == NULL ) {
+    std::cerr << "Unable to locate backtrace.dll.\n";
+    exit(1);
+  }
+#else
+  signal(SIGSEGV, &__libsdlgame_sigsegvhandler);
+#endif
+}