From: Neal Gompa Date: Sun, 16 May 2010 20:41:05 +0000 (-0500) Subject: Removing plain makefiles -- Deprecated in favor of CMake generated makefiles, which... X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=c5858e9e100e7d025d592baaf0d4626f38bc2a89;p=lugaru.git Removing plain makefiles -- Deprecated in favor of CMake generated makefiles, which now work on all major platforms --- diff --git a/makefile.old b/makefile.old deleted file mode 100644 index 4527b45..0000000 --- a/makefile.old +++ /dev/null @@ -1,404 +0,0 @@ - -macosx := false -use_devil := false -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 := . -SRCDIR := Source -SDLDIR := Dependencies/SDL12 -LIBPNGDIR := Dependencies/libpng -JPEGLIBDIR := Dependencies/libjpeg -ZLIBDIR := Dependencies/zlib -OPENALDIR := Dependencies/OpenAL -GLUDIR := Dependencies/GLU -LIBOGGDIR := Dependencies/libogg -LIBVORBISDIR := Dependencies/libvorbis - -ifeq ($(strip $(macosx)),true) - 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 += ./Dependencies/SDL12/lib/macosx/libSDL-1.2.0.dylib ./Dependencies/SDL12/lib/macosx/libSDLmain-osx.a - - INCLUDES += -IDependencies/OpenAL/include/AL - INCLUDES += -IDependencies/SDL12/include -else - CXX := g++ - CC := gcc - LD := g++ - - CFLAGS += -DPLATFORM_LINUX=1 - LDFLAGS += `pkg-config --libs sdl` - INCLUDES += `pkg-config --cflags sdl` - # Don't use bundled headers - SDLDIR := /dummy - - 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 += `pkg-config --libs openal` - INCLUDES += `pkg-config --cflags openal` - # Don't use bundled headers - OPENALDIR := /dummy - endif -endif - -DEFINES += \ - -DPLATFORM_UNIX=1 \ - -DUSE_SDL=1 \ - -DTRUE=1 \ - -DFALSE=0 \ - -Dstricmp=strcasecmp \ - -DBinIO_STDINT_HEADER="" \ - -INCLUDES += \ - -I$(SRCDIR) \ - -I$(SDLDIR)/include \ - -I./Dependencies/OpenGL/ \ - -I./Dependencies/OpenGL/GL \ - -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 -w - - -ifeq ($(strip $(EXEEXT)),) - EXEEXT := bin -endif -EXE := $(RUNDIR)/lugaru-$(EXEEXT) - -CXXFLAGS := $(CFLAGS) - -SRCS := \ - Frustum.cpp \ - GameDraw.cpp \ - GameInitDispose.cpp \ - GameTick.cpp \ - Globals.cpp \ - Lights.cpp \ - Models.cpp \ - Objects.cpp \ - pack.c \ - pack_private.c \ - Person.cpp \ - private.c \ - Quaternions.cpp \ - Random.c \ - Skeleton.cpp \ - Skybox.cpp \ - Sprites.cpp \ - Terrain.cpp \ - Text.cpp \ - TGALoader.cpp \ - unpack.c \ - unpack_private.c \ - Weapons.cpp \ - MacCompatibility.cpp \ - WinInput.cpp \ - OpenGL_Windows.cpp \ - openal_wrapper.cpp \ - -SRCS := $(foreach f,$(SRCS),$(SRCDIR)/$(f)) - - -UNUSED_SRCS := \ - DRIVER.CC \ - MD5.CC \ - -# pnggccrd.c \ -# pngvcrd.c \ - -PNGSRCS := \ - png.c \ - pngerror.c \ - pngget.c \ - pngmem.c \ - pngpread.c \ - pngread.c \ - pngrio.c \ - pngrtran.c \ - pngrutil.c \ - pngset.c \ - pngtrans.c \ - pngwio.c \ - pngwrite.c \ - pngwtran.c \ - pngwutil.c \ - -PNGSRCS := $(foreach f,$(PNGSRCS),$(LIBPNGDIR)/$(f)) - -# jdphuff.c \ -# jidctred.c \ -# jcphuff.c \ - -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 \ - jdpostct.c \ - jdsample.c \ - jdtrans.c \ - jerror.c \ - jidctflt.c \ - jidctfst.c \ - jidctint.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 \ - jcsample.c \ - jcmaster.c \ - jccolor.c \ - jcprepct.c \ - jcarith.c \ - jdarith.c \ - jaricom.c \ - -JPEGSRCS := $(foreach f,$(JPEGSRCS),$(JPEGLIBDIR)/$(f)) - -# gzio.c \ - -ZLIBSRCS = \ - adler32.c \ - compress.c \ - crc32.c \ - deflate.c \ - infback.c \ - inffast.c \ - inflate.c \ - inftrees.c \ - trees.c \ - uncompr.c \ - zutil.c \ - -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 - -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 $(macosx)),false) - SRCS += $(GLUSRCS) -endif - -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)) - - -.PHONY: clean all - -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) - @mkdir -p $(dir $@) - $(LD) -o $@ $(LDFLAGS) $(OBJS) $(APPOBJS) $(POSTLDFLAGS) - -clean: - rm -f $(BINDIR)/*.o - rm -f $(BINDIR)/$(SRCDIR)/*.o - rm -f $(BINDIR)/$(GLUDIR)/*.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 ... - diff --git a/makemac.sh b/makemac.sh deleted file mode 100755 index 2c8c2f8..0000000 --- a/makemac.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e -set -x - -NCPU=`sysctl -n hw.ncpu` - -for arch in ppc i386 x86_64 ; do - make -f makefile.old macosx=true macosx_arch=$arch clean - make -f makefile.old macosx=true macosx_arch=$arch -j$NCPU - # We always strip here. For debugging, you should do "make" directly. - strip ./lugaru-$arch - BINS="$BINS ./lugaru-$arch" -done - -rm -f ./lugaru-bin -lipo -create -o ./lugaru-bin $BINS -