X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=70c58d7f64315587e88d76cc5a7dc20416cd9bfb;hb=90366961d7188d661017383ab2f4718e4cbc89d3;hp=5c0270b0e7db982a86b23fd5cbe8b98f738802f1;hpb=6f8ab18a221ac3f232ec0e6372982d06ad9dd957;p=lugaru.git

diff --git a/makefile b/makefile
index 5c0270b..70c58d7 100644
--- a/makefile
+++ b/makefile
@@ -17,11 +17,15 @@ LIBVORBISDIR := libvorbis-1.0.1
 
 EXE := $(RUNDIR)/lugaru-bin
 
-CXX := ccache /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++
-CC := ccache /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/gcc
-#CXX := g++
-#CC := gcc
+ifeq ($(strip $(macosx)),true)
+CXX := g++-4.0
+CC := gcc-4.0
+LD := g++-4.0
+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++
+endif
 
 #OPT := -O0
 OPT := -O3 -fno-strict-aliasing -falign-loops=16 -fno-math-errno
@@ -40,6 +44,7 @@ DEFINES := \
 	-DTRUE=1 \
 	-DFALSE=0 \
 	-Dstricmp=strcasecmp \
+	-DBinIO_STDINT_HEADER="<stdint.h>" \
 
 INCLUDES := \
 			-I$(SRCDIR) \
@@ -65,13 +70,12 @@ CFLAGS := -g -c $(OPT) $(INCLUDES) $(DEFINES) -fsigned-char -pipe
 CFLAGS += -w
 
 ifeq ($(strip $(macosx)),true)
-  CFLAGS += -fpascal-strings -faltivec -fasm -force_cpusubtype_ALL -Wno-long-double -mdynamic-no-pic
-  CFLAGS += -DPLATFORM_BIGENDIAN=1 -DMACOSX=1 -DPLATFORM_MACOSX=1
-  LDFLAGS := -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework Carbon
-  APPLDFLAGS := $(SDLDIR)/lib/libSDL-1.2.0.dylib $(SDLDIR)/lib/libSDLmain-osx.a
+  CFLAGS += -mdynamic-no-pic
+  LDFLAGS := -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework Carbon -framework OpenAL
+  APPLDFLAGS := ./libSDL-1.2.0.dylib ./libSDLmain-osx.a
 else
   CFLAGS += -DPLATFORM_LINUX=1
-  LDFLAGS := ./libSDL-1.2.so.0
+  LDFLAGS := ./libSDL-1.2.so.0 -Wl,-rpath,\$$ORIGIN
 
   ifeq ($(strip $(use_devil)),true)
     LDFLAGS += ./libIL.so.1 ./libILU.so.1 ./libILUT.so.1
@@ -80,7 +84,7 @@ else
   ifeq ($(strip $(use_fmod)),true)
     POSTLDFLAGS += -lpthread ./libfmod-linux-x86.a
   else
-    LDFLAGS += ./openal.so
+    LDFLAGS += ./libopenal.so.1
   endif
 endif
 
@@ -217,6 +221,7 @@ GLUSRCS := \
 	geom.c \
 	memalloc.c \
 	mesh.c \
+	mipmap.c \
 	normal.c \
 	priorityq.c \
 	render.c \
@@ -305,8 +310,7 @@ $(BINDIR)/%.o : %.c
 $(EXE) : $(OBJS) $(APPOBJS)
 	@mkdir -p $(dir $@)
 ifeq ($(strip $(macosx)),true)
-	ranlib $(SDLDIR)/lib/libSDLmain-osx.a
-	ranlib $(FREETYPEDIR)/lib/libfreetype-osx.a
+	ranlib ./libSDLmain-osx.a
 endif
 	$(LD) -o $@ $(APPLDFLAGS) $(LDFLAGS) $(OBJS) $(APPOBJS) $(POSTLDFLAGS)