X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=22c8a94a64f503562671c2a3ca7a6ec0d40a76da;hb=7953dacde1827b7efa1f5f146ce05b134cad7fd9;hp=a85cc9b71719f3cc9f12d8e7c5a2524757226fba;hpb=ff50d2ebce620062b6988247293af3a7e3b7ab90;p=lugaru.git

diff --git a/makefile b/makefile
index a85cc9b..22c8a94 100644
--- a/makefile
+++ b/makefile
@@ -7,6 +7,7 @@ RUNDIR := run
 SRCDIR := Source
 SDLDIR := SDL12
 LIBPNGDIR := libpng-1.2.8
+JPEGLIBDIR := jpeg-6b
 ZLIBDIR := zlib-1.2.3
 
 EXE := $(RUNDIR)/lugaru-bin
@@ -17,8 +18,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
@@ -46,7 +47,7 @@ ifeq ($(strip $(use_devil)),true)
 	INCLUDES += -I$(SRCDIR)/devil/include
 else
     DEFINES += -DZ_PREFIX=1
-    INCLUDES += -I$(ZLIBDIR) -I$(LIBPNGDIR)
+    INCLUDES += -I$(ZLIBDIR) -I$(LIBPNGDIR) -I$(JPEGLIBDIR)
 endif
 
 CFLAGS := -g -c $(OPT) $(INCLUDES) $(DEFINES) -fsigned-char
@@ -59,8 +60,8 @@ 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 ./libfmod.so
+  POSTLDFLAGS := /usr/lib/libGLU.a
 
   ifeq ($(strip $(use_devil)),true)
     LDFLAGS += ./libIL.so.1 ./libILU.so.1 ./libILUT.so.1
@@ -103,7 +104,7 @@ SRCS := \
 SRCS := $(foreach f,$(SRCS),$(SRCDIR)/$(f))
 
 
-IMGSRCS := \
+PNGSRCS := \
     png.c \
     pngerror.c \
     pnggccrd.c \
@@ -122,7 +123,56 @@ IMGSRCS := \
     pngwtran.c \
     pngwutil.c \
 
-IMGSRCS := $(foreach f,$(IMGSRCS),$(LIBPNGDIR)/$(f))
+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 = \
@@ -143,7 +193,7 @@ ZLIBSRCS := $(foreach f,$(ZLIBSRCS),$(ZLIBDIR)/$(f))
 
 
 ifneq ($(strip $(use_devil)),true)
-    SRCS += $(IMGSRCS) $(ZLIBSRCS)
+    SRCS += $(PNGSRCS) $(JPEGSRCS) $(ZLIBSRCS)
 endif
 
 OBJS := $(SRCS:.CC=.o)
@@ -178,13 +228,14 @@ 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
 	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)