X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=bbda64736bab0690d95e369e9775075a0e2d593d;hb=85c20cd8cfd58b533e653a7d9d32ad8823db3736;hp=8672d2e2431c6de718b73e442dbc7d24d2a39238;hpb=d72054c5ab036810ee8a09ce57950aa977fcab06;p=lugaru.git

diff --git a/makefile b/makefile
index 8672d2e..bbda647 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,7 @@
 
 macosx := false
 use_devil := false
+use_fmod := true
 
 BINDIR := bin
 RUNDIR := run
@@ -12,14 +13,14 @@ ZLIBDIR := zlib-1.2.3
 
 EXE := $(RUNDIR)/lugaru-bin
 
-CXX := ccache g++
-CC := ccache gcc
-#CXX := g++
-#CC := gcc
+#CXX := ccache g++
+#CC := ccache gcc
+CXX := g++
+CC := gcc
 LD := g++
 
-OPT := -O0
-#OPT := -O3 -fno-strict-aliasing -falign-loops=16 -fno-math-errno
+#OPT := -O0
+OPT := -O3 -fno-strict-aliasing -falign-loops=16 -fno-math-errno
 #OPT := -Os -fno-strict-aliasing
 
 # always use this on the Mac, even in debug builds, since we aren't building
@@ -44,13 +45,18 @@ INCLUDES := \
 
 ifeq ($(strip $(use_devil)),true)
     DEFINES += -DUSE_DEVIL=1
-	INCLUDES += -I$(SRCDIR)/devil/include
+    INCLUDES += -I$(SRCDIR)/devil/include
 else
     DEFINES += -DZ_PREFIX=1
     INCLUDES += -I$(ZLIBDIR) -I$(LIBPNGDIR) -I$(JPEGLIBDIR)
 endif
 
-CFLAGS := -g -c $(OPT) $(INCLUDES) $(DEFINES) -fsigned-char
+ifeq ($(strip $(use_fmod)),false)
+    DEFINES += -DUSE_OPENAL=1
+endif
+
+
+CFLAGS := -g -c $(OPT) $(INCLUDES) $(DEFINES) -fsigned-char -pipe
 CFLAGS += -w
 
 ifeq ($(strip $(macosx)),true)
@@ -60,12 +66,16 @@ ifeq ($(strip $(macosx)),true)
   APPLDFLAGS := $(SDLDIR)/lib/libSDL-1.2.0.dylib $(SDLDIR)/lib/libSDLmain-osx.a
 else
   CFLAGS += -DPLATFORM_LINUX=1
-  #CFLAGS += -msse -mmmx
-  LDFLAGS := ./libSDL-1.2.so.0 -lGL -lGLU ./libfmod.so
+  LDFLAGS := ./libSDL-1.2.so.0
+  POSTLDFLAGS := /usr/lib/libGLU.a
 
   ifeq ($(strip $(use_devil)),true)
     LDFLAGS += ./libIL.so.1 ./libILU.so.1 ./libILUT.so.1
   endif
+
+  ifeq ($(strip $(use_fmod)),true)
+    LDFLAGS += ./libfmod.so
+  endif
 endif
 
 CXXFLAGS := $(CFLAGS)
@@ -96,14 +106,18 @@ SRCS := \
 	Weapons.cpp \
 	MacCompatibility.cpp \
 	logger/logger.cpp \
-	DRIVER.CC \
-	MD5.CC \
 	WinInput.cpp \
 	OpenGL_Windows.cpp \
+	openal_wrapper.cpp \
 
 SRCS := $(foreach f,$(SRCS),$(SRCDIR)/$(f))
 
 
+UNUSED_SRCS := \
+	DRIVER.CC \
+	MD5.CC \
+
+
 PNGSRCS := \
     png.c \
     pngerror.c \
@@ -212,7 +226,7 @@ $(BINDIR)/%.o : %.cpp
 	$(CXX) -o $@ $(CXXFLAGS) $<
 
 $(BINDIR)/%.o : %.CC
-	$(CXX) -o $@ $(CXXFLAGS) $<
+	$(CXX) -x c++ -o $@ $(CXXFLAGS) $<
 
 $(BINDIR)/%.o : %.cc
 	$(CXX) -o $@ $(CXXFLAGS) $<
@@ -228,7 +242,7 @@ ifeq ($(strip $(macosx)),true)
 	ranlib $(SDLDIR)/lib/libSDLmain-osx.a
 	ranlib $(FREETYPEDIR)/lib/libfreetype-osx.a
 endif
-	$(LD) -o $@ $(APPLDFLAGS) $(LDFLAGS) $(OBJS) $(APPOBJS)
+	$(LD) -o $@ $(APPLDFLAGS) $(LDFLAGS) $(OBJS) $(APPOBJS) $(POSTLDFLAGS)
 
 clean:
 	rm -f $(BINDIR)/*.o