X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=223e3b81382b71345ad00783160cdf76a255bde0;hb=44146d06c780d3aaa283672fedb08b8870ebe1b9;hp=ce0fa3f9dc8d99cdd8e8e6ef3190baa9088d9052;hpb=55271fd634688ea9105866ab973ba95f2cbf958f;p=lugaru.git

diff --git a/makefile b/makefile
index ce0fa3f..223e3b8 100644
--- a/makefile
+++ b/makefile
@@ -1,46 +1,133 @@
 
 macosx := false
 use_devil := false
-use_fmod := true
+use_fmod := false
+
+ifeq ($(strip $(shell uname -s)),Darwin)
+	macosx := true
+endif
+
+#OPT += -O0
+OPT += -O3 -fno-strict-aliasing -falign-loops=16 -fno-math-errno
+#OPT += -Os -fno-strict-aliasing
 
 BINDIR := bin
-RUNDIR := run
+RUNDIR := Data
 SRCDIR := Source
 SDLDIR := SDL12
 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++
-
-#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
-#  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
+
+  	ifeq ($(strip $(use_devil)),true)
+        $(error DEVIL isn't supported in the Mac OS X builds right now.)
+    endif
+
+  	ifeq ($(strip $(use_fmod)),true)
+        $(error FMOD isn't supported in the Mac OS X builds right now.)
+    endif
+
+	ifeq ($(strip $(XCODE_DIR)),)
+        XCODE_DIR := /Developer
+    endif
+
+	ifeq ($(strip $(macosx_arch)),)
+	  	macosx_arch := $(shell uname -m)
+	endif
+
+	ifeq ($(strip $(macosx_arch)),ppc)
+        macosx_arch_okay := true
+        macosx_version_min := 10.4
+        macosx_version_min_required := 1040
+		macosx_sdk_dir := MacOSX10.4u.sdk
+		macosx_gcc_dir := powerpc-apple-darwin10/4.0.1
+		macosx_gcc_libdir := $(macosx_gcc_dir)
+		macosx_cxx_dir := powerpc-apple-darwin8
+    endif
+
+	ifeq ($(strip $(macosx_arch)),i386)
+        macosx_arch_okay := true
+        macosx_version_min := 10.4
+        macosx_version_min_required := 1040
+		macosx_sdk_dir := MacOSX10.4u.sdk
+		macosx_gcc_dir := i686-apple-darwin10/4.0.1
+		macosx_gcc_libdir := $(macosx_gcc_dir)
+		macosx_cxx_dir := i686-apple-darwin8
+    endif
+
+	ifeq ($(strip $(macosx_arch)),x86_64)
+        macosx_arch_okay := true
+        macosx_version_min := 10.6
+        macosx_version_min_required := 1060
+		macosx_sdk_dir := MacOSX10.6.sdk
+		macosx_gcc_dir := i686-apple-darwin10/4.0.1
+		macosx_gcc_libdir := $(macosx_gcc_dir)/x86_64
+		macosx_cxx_dir := x86_64-apple-darwin8
+    endif
+
+	ifneq ($(strip $(macosx_arch_okay)),true)
+        $(error Unknown Mac OS X architecture. Please update the makefile.)
+    endif
+
+   	EXEEXT := $(macosx_arch)
+
+    CFLAGS += -arch $(macosx_arch)
+    CFLAGS += -mmacosx-version-min=$(macosx_version_min)
+    CFLAGS += -DMAC_OS_X_VERSION_MIN_REQUIRED=$(macosx_version_min_required)
+    CFLAGS += -nostdinc
+    CFLAGS += -F$(XCODE_DIR)/SDKs/$(macosx_sdk_dir)/System/Library/Frameworks
+    CFLAGS += -I$(XCODE_DIR)/SDKs/$(macosx_sdk_dir)/usr/lib/gcc/$(macosx_gcc_dir)/include
+    CFLAGS += -isystem $(XCODE_DIR)/SDKs/$(macosx_sdk_dir)/usr/include
+    CFLAGS += -isystem $(XCODE_DIR)/SDKs/$(macosx_sdk_dir)/usr/include/c++/4.0.0
+    CFLAGS += -isystem $(XCODE_DIR)/SDKs/$(macosx_sdk_dir)/usr/include/c++/4.0.0/$(macosx_cxx_dir)
+    CFLAGS += -isystem $(XCODE_DIR)/SDKs/$(macosx_sdk_dir)/usr/include/c++/4.0.0/$(macosx_cxx_dir)/bits
+    CFLAGS += -isystem $(XCODE_DIR)/SDKs/$(macosx_sdk_dir)/usr/include/c++/4.0.0/backward
+  	CFLAGS += -mdynamic-no-pic
+
+    LDFLAGS += -arch $(macosx_arch)
+    LDFLAGS += -mmacosx-version-min=$(macosx_version_min)
+    LDFLAGS += -F$(XCODE_DIR)/SDKs/$(macosx_sdk_dir)/System/Library/Frameworks
+    LDFLAGS += -L$(XCODE_DIR)/SDKs/$(macosx_sdk_dir)/usr/lib/gcc/$(macosx_gcc_libdir)
+    LDFLAGS += -Wl,-syslibroot,$(XCODE_DIR)/SDKs/$(macosx_sdk_dir)
+  	LDFLAGS += -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework Carbon -framework OpenAL
+  	LDFLAGS += ./libSDL-1.2.0.dylib ./libSDLmain-osx.a
+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++
+
+  	CFLAGS += -DPLATFORM_LINUX=1
+  	LDFLAGS += ./libSDL-1.2.so.0 -Wl,-rpath,\$$ORIGIN
+
+  	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 += ./libopenal.so.1
+  	endif
 endif
 
-DEFINES := \
+DEFINES += \
 	-DPLATFORM_UNIX=1 \
-	-DPLATFORM_LINUX=1 \
 	-DUSE_SDL=1 \
 	-DTRUE=1 \
 	-DFALSE=0 \
 	-Dstricmp=strcasecmp \
+	-DBinIO_STDINT_HEADER="<stdint.h>" \
 
-INCLUDES := \
+INCLUDES += \
 			-I$(SRCDIR) \
 			-I$(SDLDIR)/include \
 			-I./OpenGL/ \
@@ -59,30 +146,13 @@ ifeq ($(strip $(use_fmod)),false)
     INCLUDES += -I$(OPENALDIR)/include -I$(LIBOGGDIR)/include -I$(LIBVORBISDIR)/include
 endif
 
+CFLAGS += -g -c $(OPT) $(INCLUDES) $(DEFINES) -fsigned-char -pipe -w
 
-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
-else
-  CFLAGS += -DPLATFORM_LINUX=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
+ifeq ($(strip $(EXEEXT)),)
+   	EXEEXT := bin
 endif
+EXE := $(RUNDIR)/lugaru-$(EXEEXT)
 
 CXXFLAGS := $(CFLAGS)
 
@@ -211,6 +281,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 +329,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 +354,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
-	$(LD) -o $@ $(APPLDFLAGS) $(LDFLAGS) $(OBJS) $(APPOBJS) $(POSTLDFLAGS)
+	@mkdir -p $(dir $@)
+	$(LD) -o $@ $(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