X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=bbda64736bab0690d95e369e9775075a0e2d593d;hb=85c20cd8cfd58b533e653a7d9d32ad8823db3736;hp=8838d7bcdcf224f644ad913332a9dd726e50758d;hpb=03bd52f0a6dd79962c9e1346cb7071bcec6e83b3;p=lugaru.git

diff --git a/makefile b/makefile
index 8838d7b..bbda647 100644
--- a/makefile
+++ b/makefile
@@ -1,21 +1,26 @@
 
 macosx := false
+use_devil := false
+use_fmod := true
 
 BINDIR := bin
 RUNDIR := run
 SRCDIR := Source
 SDLDIR := SDL12
+LIBPNGDIR := libpng-1.2.8
+JPEGLIBDIR := jpeg-6b
+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
@@ -28,14 +33,30 @@ DEFINES := \
 	-DPLATFORM_UNIX=1 \
 	-DPLATFORM_LINUX=1 \
 	-DUSE_SDL=1 \
+	-DTRUE=1 \
+	-DFALSE=0 \
+	-Dstricmp=strcasecmp \
 
 INCLUDES := \
-			-I./SDL12/include \
+			-I$(SRCDIR) \
+			-I$(SDLDIR)/include \
 			-I./OpenGL/ \
 			-I./OpenGL/GL \
-			-I$(SRCDIR) \
 
-CFLAGS := -g -c $(OPT) $(INCLUDES) $(DEFINES) -fsigned-char
+ifeq ($(strip $(use_devil)),true)
+    DEFINES += -DUSE_DEVIL=1
+    INCLUDES += -I$(SRCDIR)/devil/include
+else
+    DEFINES += -DZ_PREFIX=1
+    INCLUDES += -I$(ZLIBDIR) -I$(LIBPNGDIR) -I$(JPEGLIBDIR)
+endif
+
+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)
@@ -45,8 +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 := -lSDL
+  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)
@@ -60,7 +89,6 @@ SRCS := \
 	Lights.cpp \
 	Models.cpp \
 	Objects.cpp \
-	OpenGL_Windows.cpp \
 	pack.c \
 	pack_private.c \
 	Person.cpp \
@@ -77,34 +105,136 @@ SRCS := \
 	unpack_private.c \
 	Weapons.cpp \
 	MacCompatibility.cpp \
-	WinInput.cpp \
 	logger/logger.cpp \
-	Driver.cc \
-	Md5.cc \
-	SDLInput.cpp \
+	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 \
+    pnggccrd.c \
+    pngget.c \
+    pngmem.c \
+    pngpread.c \
+    pngread.c \
+    pngrio.c \
+    pngrtran.c \
+    pngrutil.c \
+    pngset.c \
+    pngtrans.c \
+    pngvcrd.c \
+    pngwio.c \
+    pngwrite.c \
+    pngwtran.c \
+    pngwutil.c \
+
+PNGSRCS := $(foreach f,$(PNGSRCS),$(LIBPNGDIR)/$(f))
+
+JPEGSRCS := \
+	jdapistd.c \
+    jdmaster.c \
+    jdapimin.c \
+    jcapimin.c \
+    jdmerge.c \
+    jdatasrc.c \
+    jdatadst.c \
+    jdcoefct.c \
+    jdcolor.c \
+    jddctmgr.c \
+    jdhuff.c \
+    jdinput.c \
+    jdmainct.c \
+    jdmarker.c \
+    jdphuff.c \
+    jdpostct.c \
+    jdsample.c \
+    jdtrans.c \
+    jerror.c \
+    jidctflt.c \
+    jidctfst.c \
+    jidctint.c \
+    jidctred.c \
+    jmemmgr.c \
+    jutils.c \
+    jmemnobs.c \
+    jquant1.c \
+    jquant2.c \
+    jcomapi.c \
+    jcmarker.c \
+    jcapistd.c \
+    jcparam.c \
+    jcinit.c \
+    jcdctmgr.c \
+    jccoefct.c \
+    jcmainct.c \
+    jfdctflt.c \
+    jfdctint.c \
+    jfdctfst.c \
+    jchuff.c \
+    jcphuff.c \
+    jcsample.c \
+    jcmaster.c \
+    jccolor.c \
+    jcprepct.c \
+
+JPEGSRCS := $(foreach f,$(JPEGSRCS),$(JPEGLIBDIR)/$(f))
 
 
-OBJS := $(SRCS:.cpp=.o)
+ZLIBSRCS = \
+	adler32.c \
+	compress.c \
+	crc32.c \
+	deflate.c \
+	gzio.c \
+	infback.c \
+	inffast.c \
+	inflate.c \
+	inftrees.c \
+	trees.c \
+	uncompr.c \
+	zutil.c \
+
+ZLIBSRCS := $(foreach f,$(ZLIBSRCS),$(ZLIBDIR)/$(f))
+
+
+ifneq ($(strip $(use_devil)),true)
+    SRCS += $(PNGSRCS) $(JPEGSRCS) $(ZLIBSRCS)
+endif
+
+OBJS := $(SRCS:.CC=.o)
+OBJS := $(OBJS:.cc=.o)
+OBJS := $(OBJS:.cpp=.o)
 OBJS := $(OBJS:.c=.o)
 OBJS := $(OBJS:.m=.o)
 OBJS := $(foreach f,$(OBJS),$(BINDIR)/$(f))
-SRCS := $(foreach f,$(SRCS),$(SRCDIR)/$(f))
 
 
 .PHONY: clean all
 
 all : $(EXE)
 
-$(BINDIR)/%.o : $(SRCDIR)/%.cpp
+$(BINDIR)/%.o : %.cpp
 	$(CXX) -o $@ $(CXXFLAGS) $<
 
-$(BINDIR)/%.o : $(SRCDIR)/%.CC
+$(BINDIR)/%.o : %.CC
+	$(CXX) -x c++ -o $@ $(CXXFLAGS) $<
+
+$(BINDIR)/%.o : %.cc
 	$(CXX) -o $@ $(CXXFLAGS) $<
 
-$(BINDIR)/%.o : $(SRCDIR)/%.m
+$(BINDIR)/%.o : %.m
 	$(CC) -o $@ $(CFLAGS) $<
 
-$(BINDIR)/%.o : $(SRCDIR)/%.c
+$(BINDIR)/%.o : %.c
 	$(CC) -o $@ $(CFLAGS) $<
 
 $(EXE) : $(OBJS) $(APPOBJS)
@@ -112,11 +242,16 @@ 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 -rf $(BINDIR)/*.o
-	rm -rf $(EXE)
+	rm -f $(BINDIR)/*.o
+	rm -f $(BINDIR)/$(SRCDIR)/*.o
+	rm -f $(BINDIR)/$(SRCDIR)/logger/*.o
+	rm -f $(BINDIR)/$(LIBPNGDIR)/*.o
+	rm -f $(BINDIR)/$(JPEGLIB)/*.o
+	rm -f $(BINDIR)/$(ZLIBDIR)/*.o
+	rm -f $(EXE)
 
 # end of makefile ...