add targets for building C++ code

diff --git a/build/exe.mk b/build/exe.mk
index 7784332343d3d2961779e1c7e0ca0ac5647e5d5f..d536a353ae4dc7cfe7b8b142edeac98a4d8745c5 100644 (file)
--- a/build/exe.mk
+++ b/build/exe.mk
@@ -21,8 +21,10 @@
 
 ifeq ($(DARWIN_BUILD),yes)
 CC          = cc
+CCC         = c++
 else
 CC          = gcc
+CCC         = g++
 endif
 NASM        = nasm
 # LINKAGE can be forced to -static or -dynamic from invocation if desired, but it defaults to -static except on OSX
@@ -53,8 +55,12 @@ $(PROGRAM) : $(OBJS)
 
 %.o : %.c
        $(CC) $(CFLAGS) -c $< -o $@
+%.o : %.cc
+       $(CCC) $(CFLAGS) -c $< -o $@
 %.i : %.c
        $(CC) $(CFLAGS) -E $< -o $@
+%.i : %.cc
+       $(CCC) $(CFLAGS) -E $< -o $@
 
 %.o : %.nasm
        $(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ $< -o $@

diff --git a/build/lib.mk b/build/lib.mk
index 11095fca9eae98119703a2a0fa90c2dc2b448d55..90a0cbc2ac366b8f21e2b5b3ef16b640bfbc284c 100644 (file)
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -21,8 +21,10 @@
 
 ifeq ($(DARWIN_BUILD),yes)
 CC          = cc
+CCC         = c++
 else
 CC          = gcc
+CCC         = g++
 endif
 NASM        = nasm
 LINK        = ar cru
@@ -65,8 +67,12 @@ endif
 
 %.o : %.c
        $(CC) $(CFLAGS) -c $< -o $@
+%.o : %.cc
+       $(CCC) $(CFLAGS) -c $< -o $@
 %.i : %.c
        $(CC) $(CFLAGS) -E $< -o $@
+%.i : %.cc
+       $(CCC) $(CFLAGS) -E $< -o $@
 
 %.o : %.nasm
        $(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ $< -o $@