Holy Build Box makefile tweaks.

diff --git a/makefile b/makefile
index 22c8a94a64f503562671c2a3ca7a6ec0d40a76da..30f94cd703a187dd8152d81512e90b6c52f7e6a3 100644 (file)
--- 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) $<