Use const char * for string arguments to avoid deprecated conversion warnings.

[lugaru.git] / makefile.old

diff --git a/makefile.old b/makefile.old
index 223e3b81382b71345ad00783160cdf76a255bde0..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
 
@@ -181,7 +187,6 @@ SRCS := \
        unpack_private.c \
        Weapons.cpp \
        MacCompatibility.cpp \
-       logger/logger.cpp \
        WinInput.cpp \
        OpenGL_Windows.cpp \
        openal_wrapper.cpp \
@@ -380,7 +385,6 @@ $(EXE) : $(OBJS) $(APPOBJS)
 clean:
        rm -f $(BINDIR)/*.o
        rm -f $(BINDIR)/$(SRCDIR)/*.o
-       rm -f $(BINDIR)/$(SRCDIR)/logger/*.o
        rm -f $(BINDIR)/$(GLUDIR)/*.o
        rm -f $(BINDIR)/$(LIBPNGDIR)/*.o
        rm -f $(BINDIR)/$(JPEGLIBDIR)/*.o