Added c++ support.

Common.mk

@@ -37,25 +37,25 @@ clobber: clean
 
 depend::
 	@echo -n >.depend
-	@for i in $(OBJS:.o=.c) ; do\
+	@for i in $(OBJS:.o=.c*) ; do\
 	$(CC) -MM $(IFLAGS) $(DFLAGS) $$i >>.depend ; done
 
 tags::
-	@for i in $(OBJS:.o=.c) ; do\
+	@for i in $(OBJS:.o=.c*) ; do\
 	cd .. ;\
 	ctags $(CTAGSFLAGS) $(TAGS) $(MODULE)/$$i ;\
 	cd $(MODULE) ;\
 	done
 
 ci::
-	ci -l $(OBJS:.o=.c) $(HDRS) Makefile
+	ci -l $(OBJS:.o=.c*) $(HDRS) Makefile
 
 lockver::
-	$(LOCKVER) $(OBJS:.o=.c) $(HDRS) Makefile
+	$(LOCKVER) $(OBJS:.o=.c*) $(HDRS) Makefile
 
 distlist::
 	@echo >>$(DISTLIST)
-	@for i in `echo $(OBJS:.o=.c)` $(HDRS) Makefile $(EXTRA) ; do \
+	@for i in `echo $(OBJS:.o=.c*)` $(HDRS) Makefile $(EXTRA) ; do \
 	echo src/$(MODULE)/$$i >>$(DISTLIST) ; done
 
 $(OBJS): $(TOPDIR)/Rules.make

Makefile

@@ -89,12 +89,12 @@ etlib/prgname.o: etlib/prgname.c
 
 # UNIX-TARGET
 freecraft:	src etlib/hash.o src/libclone.a
-	$(CC) -o freecraft src/libclone.a $(CLONELIBS) -I. $(CFLAGS)
+	$(CCLD) -o freecraft src/libclone.a $(CLONELIBS) -I. $(CFLAGS)
 
 # WIN32-TARGET
 freecraft.exe:	src etlib/prgname.o etlib/getopt.o etlib/hash.o \
 		src/freecraftrc.o src/libclone.a
-	$(CC) -o freecraft$(EXE) src/main.c src/libclone.a src/freecraftrc.o \
+	$(CCLD) -o freecraft$(EXE) src/main.c src/libclone.a src/freecraftrc.o \
 	-lSDLmain $(CLONELIBS) -I. $(CFLAGS)
 
 src/freecraftrc.o: src/freecraft.rc

Rules.make.orig

@@ -212,6 +212,7 @@ CFLAGS=-g -O3 $(PROFILE) -pipe -Wcast-align -Wall $(IFLAGS)  $(DFLAGS)
 #CFLAGS=-O6 -pipe -fomit-frame-pointer -fconserve-space -fexpensive-optimizations -ffast-math  $(IFLAGS) $(DFLAGS) -static
 
 CC=cc
+CCLD=c++
 RM=rm -f
 MAKE=make
 

setup

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 RULESFILE=Rules.make
 BEOS_CONFIGFILE=/boot/home/config/settings/FreeCraft/FreeCraft.cfg
@@ -56,6 +56,7 @@ EXTRA_CFLAGS="-DUNIT_ON_MAP -DNEW_AI"
 
 # Compile commands
 CC=gcc
+CCLD=g++
 RM="rm -f"
 MAKE=make
 
@@ -227,6 +228,7 @@ if [ "$DARWIN" = "0" ] ; then
     BEOS=0
     WIN32=0
     CC=cc
+    CCLD=c++
    CFLAGS="-O2 -pipe -fomit-frame-pointer -fconserve-space -fexpensive-optimizations -ffast-math  \$(IFLAGS) \$(DFLAGS) -traditional-cpp"
     echo "It appears that you are in a Darwin environment..."
     echo "Use --beos, --win32 or --unix to override"
@@ -313,6 +315,7 @@ fi
 
 echo "# Compile commands" >> $RULESFILE
 echo "CC=$CC" >> $RULESFILE
+echo "CCLD=$CCLD" >> $RULESFILE
 echo "RM=$RM" >> $RULESFILE
 echo "MAKE=$MAKE" >> $RULESFILE
 echo >> $RULESFILE