X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=54b17068223753cde0f8a529d93f6e62eba12472;hb=a7c43f7122886855dce21603361766000f622288;hp=28740fe5ab222cffd7d54ac1a2fa006355595d87;hpb=2adf4594e7eccc24647a6fce8ebf77da56c9c9d0;p=lugaru.git

diff --git a/makefile b/makefile
index 28740fe..54b1706 100644
--- a/makefile
+++ b/makefile
@@ -11,34 +11,44 @@ LIBPNGDIR := libpng-1.2.8
 JPEGLIBDIR := jpeg-6b
 ZLIBDIR := zlib-1.2.3
 OPENALDIR := OpenAL
+GLUDIR := GLU
 LIBOGGDIR := libogg-1.0
 LIBVORBISDIR := libvorbis-1.0.1
 
-EXE := $(RUNDIR)/lugaru-bin
 
-CXX := ccache g++
-CC := ccache gcc
-#CXX := g++
-#CC := gcc
-LD := g++
+ifeq ($(strip $(macosx_arch)),)
+  macosx_arch := i386
+endif
 
-#OPT := -O0
-OPT := -O3 -fno-strict-aliasing -falign-loops=16 -fno-math-errno
-#OPT := -Os -fno-strict-aliasing
+ifeq ($(strip $(macosx)),true)
+   EXEEXT := $(macosx_arch)
+else
+   EXEEXT := bin
+endif
+
+EXE := $(RUNDIR)/lugaru-$(EXEEXT)
 
-# always use this on the Mac, even in debug builds, since we aren't building
-#  a dylib at this point.
 ifeq ($(strip $(macosx)),true)
-  OPT += -mdynamic-no-pic
+	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
+#OPT := -Os -fno-strict-aliasing
+
 DEFINES := \
 	-DPLATFORM_UNIX=1 \
-	-DPLATFORM_LINUX=1 \
 	-DUSE_SDL=1 \
 	-DTRUE=1 \
 	-DFALSE=0 \
 	-Dstricmp=strcasecmp \
+	-DBinIO_STDINT_HEADER="<stdint.h>" \
 
 INCLUDES := \
 			-I$(SRCDIR) \
@@ -64,14 +74,17 @@ 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
+  ifneq ($(strip $(macosx_arch)),)
+	  CFLAGS += -arch $(macosx_arch)
+	  LDFLAGS += -arch $(macosx_arch)
+	  APPLDFLAGS += -arch $(macosx_arch)
+  endif
 else
   CFLAGS += -DPLATFORM_LINUX=1
-  LDFLAGS := ./libSDL-1.2.so.0
-  POSTLDFLAGS := /usr/lib/libGLU.a
+  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 +93,7 @@ else
   ifeq ($(strip $(use_fmod)),true)
     POSTLDFLAGS += -lpthread ./libfmod-linux-x86.a
   else
-    LDFLAGS += ./openal.so
+    LDFLAGS += ./libopenal.so.1
   endif
 endif
 
@@ -211,6 +224,24 @@ ZLIBSRCS = \
 
 ZLIBSRCS := $(foreach f,$(ZLIBSRCS),$(ZLIBDIR)/$(f))
 
+
+GLUSRCS := \
+	dict.c \
+	geom.c \
+	memalloc.c \
+	mesh.c \
+	mipmap.c \
+	normal.c \
+	priorityq.c \
+	render.c \
+	sweep.c \
+	tess.c \
+	tessmono.c \
+	util.c \
+
+GLUSRCS := $(foreach f,$(GLUSRCS),$(GLUDIR)/$(f))
+
+
 OGGSRCS := \
 	bitwise.o \
 	framing.o
@@ -241,6 +272,9 @@ VORBISSRCS := \
 
 VORBISSRCS := $(foreach f,$(VORBISSRCS),$(LIBVORBISDIR)/lib/$(f))
 
+ifeq ($(strip $(macosx)),false)
+	SRCS += $(GLUSRCS)
+endif
 
 ifeq ($(strip $(use_devil)),false)
     SRCS += $(PNGSRCS) $(JPEGSRCS) $(ZLIBSRCS)
@@ -263,31 +297,34 @@ OBJS := $(foreach f,$(OBJS),$(BINDIR)/$(f))
 all : $(EXE)
 
 $(BINDIR)/%.o : %.cpp
+	@mkdir -p $(dir $@)
 	$(CXX) -o $@ $(CXXFLAGS) $<
 
 $(BINDIR)/%.o : %.CC
+	@mkdir -p $(dir $@)
 	$(CXX) -x c++ -o $@ $(CXXFLAGS) $<
 
 $(BINDIR)/%.o : %.cc
+	@mkdir -p $(dir $@)
 	$(CXX) -o $@ $(CXXFLAGS) $<
 
 $(BINDIR)/%.o : %.m
+	@mkdir -p $(dir $@)
 	$(CC) -o $@ $(CFLAGS) $<
 
 $(BINDIR)/%.o : %.c
+	@mkdir -p $(dir $@)
 	$(CC) -o $@ $(CFLAGS) $<
 
 $(EXE) : $(OBJS) $(APPOBJS)
-ifeq ($(strip $(macosx)),true)
-	ranlib $(SDLDIR)/lib/libSDLmain-osx.a
-	ranlib $(FREETYPEDIR)/lib/libfreetype-osx.a
-endif
+	@mkdir -p $(dir $@)
 	$(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)/$(GLUDIR)/*.o
 	rm -f $(BINDIR)/$(LIBPNGDIR)/*.o
 	rm -f $(BINDIR)/$(JPEGLIBDIR)/*.o
 	rm -f $(BINDIR)/$(ZLIBDIR)/*.o