Fixed a mistake in using ConvertFileName() in 'GameInitDispose.cpp'

[lugaru.git] / makefile.old

diff --git a/makefile.old b/makefile.old
index 223e3b81382b71345ad00783160cdf76a255bde0..4527b4518bed3d6c7d0e9da8ccb8cb794cb4d3a5 100644 (file)
--- a/makefile.old
+++ b/makefile.old
@@ -12,16 +12,16 @@ OPT += -O3 -fno-strict-aliasing -falign-loops=16 -fno-math-errno
 #OPT += -Os -fno-strict-aliasing
 
 BINDIR := bin
-RUNDIR := Data
+RUNDIR := .
 SRCDIR := Source
-SDLDIR := SDL12
-LIBPNGDIR := libpng-1.2.8
-JPEGLIBDIR := jpeg-6b
-ZLIBDIR := zlib-1.2.3
-OPENALDIR := OpenAL
-GLUDIR := GLU
-LIBOGGDIR := libogg-1.0
-LIBVORBISDIR := libvorbis-1.0.1
+SDLDIR := Dependencies/SDL12
+LIBPNGDIR := Dependencies/libpng
+JPEGLIBDIR := Dependencies/libjpeg
+ZLIBDIR := Dependencies/zlib
+OPENALDIR := Dependencies/OpenAL
+GLUDIR := Dependencies/GLU
+LIBOGGDIR := Dependencies/libogg
+LIBVORBISDIR := Dependencies/libvorbis
 
 ifeq ($(strip $(macosx)),true)
        CXX := g++-4.0
@@ -99,14 +99,20 @@ ifeq ($(strip $(macosx)),true)
     LDFLAGS += -L$(XCODE_DIR)/SDKs/$(macosx_sdk_dir)/usr/lib/gcc/$(macosx_gcc_libdir)
     LDFLAGS += -Wl,-syslibroot,$(XCODE_DIR)/SDKs/$(macosx_sdk_dir)
        LDFLAGS += -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework Carbon -framework OpenAL
-       LDFLAGS += ./libSDL-1.2.0.dylib ./libSDLmain-osx.a
+       LDFLAGS += ./Dependencies/SDL12/lib/macosx/libSDL-1.2.0.dylib ./Dependencies/SDL12/lib/macosx/libSDLmain-osx.a
+
+       INCLUDES += -IDependencies/OpenAL/include/AL
+       INCLUDES += -IDependencies/SDL12/include
 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 +121,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
 
@@ -130,8 +139,8 @@ DEFINES += \
 INCLUDES += \
                        -I$(SRCDIR) \
                        -I$(SDLDIR)/include \
-                       -I./OpenGL/ \
-                       -I./OpenGL/GL \
+                       -I./Dependencies/OpenGL/ \
+                       -I./Dependencies/OpenGL/GL \
 
 ifeq ($(strip $(use_devil)),true)
     DEFINES += -DUSE_DEVIL=1
@@ -181,7 +190,6 @@ SRCS := \
        unpack_private.c \
        Weapons.cpp \
        MacCompatibility.cpp \
-       logger/logger.cpp \
        WinInput.cpp \
        OpenGL_Windows.cpp \
        openal_wrapper.cpp \
@@ -193,11 +201,12 @@ UNUSED_SRCS := \
        DRIVER.CC \
        MD5.CC \
 
+#    pnggccrd.c \
+#    pngvcrd.c \
 
 PNGSRCS := \
     png.c \
     pngerror.c \
-    pnggccrd.c \
     pngget.c \
     pngmem.c \
     pngpread.c \
@@ -207,7 +216,6 @@ PNGSRCS := \
     pngrutil.c \
     pngset.c \
     pngtrans.c \
-    pngvcrd.c \
     pngwio.c \
     pngwrite.c \
     pngwtran.c \
@@ -215,6 +223,10 @@ PNGSRCS := \
 
 PNGSRCS := $(foreach f,$(PNGSRCS),$(LIBPNGDIR)/$(f))
 
+#    jdphuff.c \
+#    jidctred.c \
+#    jcphuff.c \
+
 JPEGSRCS := \
        jdapistd.c \
     jdmaster.c \
@@ -230,7 +242,6 @@ JPEGSRCS := \
     jdinput.c \
     jdmainct.c \
     jdmarker.c \
-    jdphuff.c \
     jdpostct.c \
     jdsample.c \
     jdtrans.c \
@@ -238,7 +249,6 @@ JPEGSRCS := \
     jidctflt.c \
     jidctfst.c \
     jidctint.c \
-    jidctred.c \
     jmemmgr.c \
     jutils.c \
     jmemnobs.c \
@@ -256,21 +266,23 @@ JPEGSRCS := \
     jfdctint.c \
     jfdctfst.c \
     jchuff.c \
-    jcphuff.c \
     jcsample.c \
     jcmaster.c \
     jccolor.c \
     jcprepct.c \
+    jcarith.c \
+    jdarith.c \
+    jaricom.c \
 
 JPEGSRCS := $(foreach f,$(JPEGSRCS),$(JPEGLIBDIR)/$(f))
 
+#      gzio.c \
 
 ZLIBSRCS = \
        adler32.c \
        compress.c \
        crc32.c \
        deflate.c \
-       gzio.c \
        infback.c \
        inffast.c \
        inflate.c \
@@ -380,7 +392,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