X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=28740fe5ab222cffd7d54ac1a2fa006355595d87;hb=c62522f90f5dc405505af885e00c8134f17d8c88;hp=c672353c246a3bfadece582a04a4f511143460e2;hpb=1bbb44900613dcf8d7ec2d24c5ec3f04467b4281;p=lugaru.git

diff --git a/makefile b/makefile
index c672353..28740fe 100644
--- a/makefile
+++ b/makefile
@@ -1,10 +1,18 @@
 
 macosx := false
+use_devil := false
+use_fmod := false
 
 BINDIR := bin
 RUNDIR := run
 SRCDIR := Source
 SDLDIR := SDL12
+LIBPNGDIR := libpng-1.2.8
+JPEGLIBDIR := jpeg-6b
+ZLIBDIR := zlib-1.2.3
+OPENALDIR := OpenAL
+LIBOGGDIR := libogg-1.0
+LIBVORBISDIR := libvorbis-1.0.1
 
 EXE := $(RUNDIR)/lugaru-bin
 
@@ -14,8 +22,8 @@ CC := ccache gcc
 #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
@@ -33,13 +41,26 @@ DEFINES := \
 	-Dstricmp=strcasecmp \
 
 INCLUDES := \
-			-I./SDL12/include \
+			-I$(SRCDIR) \
+			-I$(SDLDIR)/include \
 			-I./OpenGL/ \
 			-I./OpenGL/GL \
-			-I$(SRCDIR) \
-			-I$(SRCDIR)/devil/include \
 
-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
+    INCLUDES += -I$(OPENALDIR)/include -I$(LIBOGGDIR)/include -I$(LIBVORBISDIR)/include
+endif
+
+
+CFLAGS := -g -c $(OPT) $(INCLUDES) $(DEFINES) -fsigned-char -pipe
 CFLAGS += -w
 
 ifeq ($(strip $(macosx)),true)
@@ -49,8 +70,18 @@ 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 ./libIL.so.1 ./libILU.so.1 ./libILUT.so.1
+  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)
+    POSTLDFLAGS += -lpthread ./libfmod-linux-x86.a
+  else
+    LDFLAGS += ./openal.so
+  endif
 endif
 
 CXXFLAGS := $(CFLAGS)
@@ -81,38 +112,169 @@ SRCS := \
 	Weapons.cpp \
 	MacCompatibility.cpp \
 	logger/logger.cpp \
+	WinInput.cpp \
+	OpenGL_Windows.cpp \
+	openal_wrapper.cpp \
+
+SRCS := $(foreach f,$(SRCS),$(SRCDIR)/$(f))
+
+
+UNUSED_SRCS := \
 	DRIVER.CC \
 	MD5.CC \
-	SDLInput.cpp \
-	OpenGL_Windows.cpp \
 
 
+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))
+
+
+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))
+
+OGGSRCS := \
+	bitwise.o \
+	framing.o
+
+OGGSRCS := $(foreach f,$(OGGSRCS),$(LIBOGGDIR)/src/$(f))
+
+VORBISSRCS := \
+	analysis.o \
+    bitrate.o \
+    block.o \
+    codebook.o \
+    envelope.o \
+    floor0.o \
+    floor1.o \
+    info.o \
+    lpc.o \
+    lsp.o \
+    mapping0.o \
+    mdct.o \
+    psy.o \
+    registry.o \
+    res0.o \
+    sharedbook.o \
+    smallft.o \
+    synthesis.o \
+    vorbisfile.o \
+    window.o
+
+VORBISSRCS := $(foreach f,$(VORBISSRCS),$(LIBVORBISDIR)/lib/$(f))
+
+
+ifeq ($(strip $(use_devil)),false)
+    SRCS += $(PNGSRCS) $(JPEGSRCS) $(ZLIBSRCS)
+endif
+
+ifeq ($(strip $(use_fmod)),false)
+    SRCS += $(OGGSRCS) $(VORBISSRCS)
+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
-	$(CXX) -o $@ $(CXXFLAGS) $<
+$(BINDIR)/%.o : %.CC
+	$(CXX) -x c++ -o $@ $(CXXFLAGS) $<
 
-$(BINDIR)/%.o : $(SRCDIR)/%.cc
+$(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)
@@ -120,12 +282,18 @@ 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 $(BINDIR)/logger/*.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)/$(JPEGLIBDIR)/*.o
+	rm -f $(BINDIR)/$(ZLIBDIR)/*.o
+	rm -f $(BINDIR)/$(LIBOGGDIR)/src/*.o
+	rm -f $(BINDIR)/$(LIBVORBISDIR)/lib/*.o
+	rm -f $(EXE)
 
 # end of makefile ...