Merge to unconfuse my repo.

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index a50c24ff99d7f2f5ac4ae6446f0c60c313c57c01..550552e3c361016f4d5df3da0b6038f338dfac83 100644 (file)
--- 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 c042a0814857b0aae2cf3ac071a2411a5fdd9dbd..b790e48584c8c80930029ec82bed3425a017573e 100644 (file)
--- 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 ac33ff144294da7040e041099dbd62b650f64012..1afe20286ee027f48f1d3264794ddc826de81377 100755 (executable)
--- 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