From: Ryan C. Gordon <icculus@icculus.org>
Date: Thu, 13 May 2010 00:56:47 +0000 (-0400)
Subject: Merge to unconfuse my repo.
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=5caf4edd361a27a3250fdbf5e8084b0d5c55d615;hp=9fed70c39623e323818ef89061ad8b3040cd7c73;p=lugaru.git

Merge to unconfuse my repo.
---

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index a50c24f..550552e 100644
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -37,9 +37,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#include "Game.h"
 #else
 
-	#include <zlib.h>
-	#include <png.h>
-	#include <jpeglib.h>
+    extern "C" {
+    	#include "zlib.h"
+	    #include "png.h"
+    	#include "jpeglib.h"
+    }
 	#include "Game.h"
     static bool load_image(const char * fname, TGAImageRec & tex);
     static bool load_png(const char * fname, TGAImageRec & tex);
diff --git a/makefile.old b/makefile.old
index c042a08..b790e48 100644
--- a/makefile.old
+++ b/makefile.old
@@ -101,12 +101,15 @@ ifeq ($(strip $(macosx)),true)
   	LDFLAGS += -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework Carbon -framework OpenAL
   	LDFLAGS += ./libSDL-1.2.0.dylib ./libSDLmain-osx.a
 else
-	CXX := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++
-	CC := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/gcc
-	LD := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++
+	CXX := g++
+	CC := gcc
+	LD := g++
 
   	CFLAGS += -DPLATFORM_LINUX=1
-  	LDFLAGS += ./libSDL-1.2.so.0 -Wl,-rpath,\$$ORIGIN
+  	LDFLAGS += `pkg-config --libs sdl`
+	INCLUDES += `pkg-config --cflags sdl`
+	# Don't use bundled headers
+	SDLDIR := /dummy
 
   	ifeq ($(strip $(use_devil)),true)
     	LDFLAGS += ./libIL.so.1 ./libILU.so.1 ./libILUT.so.1
@@ -115,7 +118,10 @@ else
   	ifeq ($(strip $(use_fmod)),true)
     	POSTLDFLAGS += -lpthread ./libfmod-linux-x86.a
   	else
-    	LDFLAGS += ./libopenal.so.1
+    	LDFLAGS += `pkg-config --libs openal`
+    	INCLUDES += `pkg-config --cflags openal`
+	# Don't use bundled headers
+	OPENALDIR := /dummy
   	endif
 endif
 
diff --git a/makemac.sh b/makemac.sh
index ac33ff1..1afe202 100755
--- a/makemac.sh
+++ b/makemac.sh
@@ -9,10 +9,10 @@ for arch in ppc i386 x86_64 ; do
     make -f makefile.old macosx=true macosx_arch=$arch clean
     make -f makefile.old macosx=true macosx_arch=$arch -j$NCPU
     # We always strip here. For debugging, you should do "make" directly.
-    strip run/lugaru-$arch
-    BINS="$BINS run/lugaru-$arch"
+    strip Data/lugaru-$arch
+    BINS="$BINS Data/lugaru-$arch"
 done
 
-rm -f run/lugaru-bin
-lipo -create -o run/lugaru-bin $BINS
+rm -f Data/lugaru-bin
+lipo -create -o Data/lugaru-bin $BINS