From b7557fd93e119c68668088c9fed3155c780420ed Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Fri, 17 May 2002 06:08:44 +0000 Subject: [PATCH] add targets for building C++ code --- build/exe.mk | 6 ++++++ build/lib.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/build/exe.mk b/build/exe.mk index 77843323..d536a353 100644 --- 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 11095fca..90a0cbc2 100644 --- 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 $@