From 2edf335a120e7bc33cb14bac5576fbadee89903b Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 8 Aug 2005 02:51:48 +0000 Subject: [PATCH] Holy Build Box makefile tweaks. --- makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/makefile b/makefile index 22c8a94..30f94cd 100644 --- a/makefile +++ b/makefile @@ -12,10 +12,10 @@ ZLIBDIR := zlib-1.2.3 EXE := $(RUNDIR)/lugaru-bin -CXX := ccache g++ -CC := ccache gcc -#CXX := g++ -#CC := gcc +#CXX := ccache g++ +#CC := ccache gcc +CXX := g++ +CC := gcc LD := g++ #OPT := -O0 @@ -50,7 +50,7 @@ else INCLUDES += -I$(ZLIBDIR) -I$(LIBPNGDIR) -I$(JPEGLIBDIR) endif -CFLAGS := -g -c $(OPT) $(INCLUDES) $(DEFINES) -fsigned-char +CFLAGS := -g -c $(OPT) $(INCLUDES) $(DEFINES) -fsigned-char -pipe CFLAGS += -w ifeq ($(strip $(macosx)),true) @@ -96,14 +96,17 @@ SRCS := \ Weapons.cpp \ MacCompatibility.cpp \ logger/logger.cpp \ - DRIVER.CC \ - MD5.CC \ WinInput.cpp \ OpenGL_Windows.cpp \ SRCS := $(foreach f,$(SRCS),$(SRCDIR)/$(f)) +UNUSED_SRCS := \ + DRIVER.CC \ + MD5.CC \ + + PNGSRCS := \ png.c \ pngerror.c \ @@ -212,7 +215,7 @@ $(BINDIR)/%.o : %.cpp $(CXX) -o $@ $(CXXFLAGS) $< $(BINDIR)/%.o : %.CC - $(CXX) -o $@ $(CXXFLAGS) $< + $(CXX) -x c++ -o $@ $(CXXFLAGS) $< $(BINDIR)/%.o : %.cc $(CXX) -o $@ $(CXXFLAGS) $< -- 2.39.5