From 50e6c880ccb5d3cfa08fbcf10bc5f62425d8279b Mon Sep 17 00:00:00 2001 From: Tyrann Date: Sun, 10 Sep 2006 17:38:34 +0930 Subject: [PATCH] [PATCH 9/9] qbsp: Compile as C code Now that all the C++isms have been removed, rename the .cpp source files to .c and remove the special case makefile rules for compiling qbsp object files. Signed-off-by: Tyrann --- Makefile | 11 +---------- qbsp/{file.cpp => file.c} | 0 qbsp/{parser.cpp => parser.c} | 0 qbsp/{wad.cpp => wad.c} | 0 4 files changed, 1 insertion(+), 10 deletions(-) rename qbsp/{file.cpp => file.c} (100%) rename qbsp/{parser.cpp => parser.c} (100%) rename qbsp/{wad.cpp => wad.c} (100%) diff --git a/Makefile b/Makefile index c48f5ca1..c481feef 100644 --- a/Makefile +++ b/Makefile @@ -136,19 +136,10 @@ bsputil/$(BIN_PFX)bsputil$(EXT): $(BSPUTIL_OFILES) # Qbsp # ######## -# Quick hack job to get qbsp compiling. Source code is still a mix of C/C++, -# including C++ in .c files - hence the extra implicit rules - QBSP_OBJECTS = \ brush.o bspfile.o cmdlib.o csg4.o file.o globals.o map.o \ mathlib.o merge.o outside.o parser.o portals.o qbsp.o solidbsp.o \ surfaces.o tjunc.o util.o wad.o winding.o writebsp.o -qbsp/%.o: qbsp/%.c - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $< - -qbsp/%.o: qbsp/%.cpp - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $< - qbsp/$(BIN_PFX)qbsp$(EXT): $(patsubst %,qbsp/%,$(QBSP_OBJECTS)) - $(CXX) -o $@ $^ $(LCURSES) + $(CC) -o $@ $^ $(LCURSES) diff --git a/qbsp/file.cpp b/qbsp/file.c similarity index 100% rename from qbsp/file.cpp rename to qbsp/file.c diff --git a/qbsp/parser.cpp b/qbsp/parser.c similarity index 100% rename from qbsp/parser.cpp rename to qbsp/parser.c diff --git a/qbsp/wad.cpp b/qbsp/wad.c similarity index 100% rename from qbsp/wad.cpp rename to qbsp/wad.c