diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2010-06-13 20:21:31 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2010-06-13 20:21:31 +0200 |
| commit | d1ed63e35e95bdc73b20cebd9123d8a2d7a43ec1 (patch) | |
| tree | ef0a2c210f3bd081785235575bac2e3addb7d525 /makefiles/gmake/compiler.mk | |
| parent | 7704c015826d571fdd9af6f1d691410f6b6355ac (diff) | |
| download | wolfbones-d1ed63e35e95bdc73b20cebd9123d8a2d7a43ec1.tar.gz wolfbones-d1ed63e35e95bdc73b20cebd9123d8a2d7a43ec1.tar.bz2 | |
removed most of the C++ stuff
added a TEST_DYNAMIC_* variables in order to be able to build test libraries
(as for testing the library loader)
Diffstat (limited to 'makefiles/gmake/compiler.mk')
| -rw-r--r-- | makefiles/gmake/compiler.mk | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/makefiles/gmake/compiler.mk b/makefiles/gmake/compiler.mk index 8e9c978..a2a0baa 100644 --- a/makefiles/gmake/compiler.mk +++ b/makefiles/gmake/compiler.mk @@ -5,10 +5,8 @@ # # provides: # - BIN_OBJS: the object files we need for the binaries which we build always -# - CPP_BIN_OBJS: same for binaries which have C++ code in them # - TEST_BIN_OBJS: same as BIN_OBJS but for test binaries compiled only when # testing -# - TEST_CPP_BIN_OBJS: same for C++ tests # # start of gcc section @@ -120,10 +118,6 @@ endif endif -CCPP_COMPILE_FLAGS = \ - $(COMMON_COMPILE_FLAGS) \ - -std=c++98 - # gcc 4.x ifeq "$(GCC_MAJOR_VERSION)" "4" CCPP_COMPILE_FLAGS += \ @@ -132,22 +126,9 @@ endif ifeq "$(GCC_MAJOR_VERSION)" "3" -# gcc 3.4, not tested yet -ifeq "$(GCC_MINOR_VERSION)" "4" -CCPP_COMPILE_FLAGS += \ - -Wno-invalid-offsetof -endif - -# gcc 3.3, testend on OpenBSD 4.2 -ifeq "$(GCC_MINOR_VERSION)" "3" -#CCPP_COMPILE_FLAGS += \ -# -Wdeclaration-after-statement -endif - endif #CC = gcc -CCPP = g++ endif @@ -162,7 +143,6 @@ endif ifeq "$(COMPILER)" "tcc" COMPILE_FLAGS = \ -Wall -Werror -Wunsupported -Wwrite-strings -g -CCPP = tcc endif # end of tcc section @@ -209,7 +189,6 @@ endif ifeq "$(COMPILER)" "pcc" COMPILE_FLAGS = \ --fatal-warnings -g -CCPP = pcc endif # end of pcc section @@ -313,19 +292,14 @@ endif #endif CFLAGS = $(COMPILE_FLAGS) $(PLATFORM_COMPILE_FLAGS) $(INCLUDE_DIRS) $(INCLUDE_CFLAGS) $(PTHREADS_CFLAGS) -CCPPFLAGS = $(CCPP_COMPILE_FLAGS) $(PLATFORM_COMPILE_FLAGS) $(INCLUDE_DIRS) $(INCLUDE_CPPFLAGS) $(PTHREADS_CFLAGS) LDFLAGS = $(INCLUDE_LDFLAGS) $(PTHREADS_LDFLAGS) $(LDFLAGS_NET) $(LDFLAGS_LT) $(LDFLAGS_DL) LIBS = $(INCLUDE_LIBS) $(PTHREADS_LIBS) $(LIBS_NET) $(LIBS_LT) $(LIBS_DL) LINK = $(CC) -CCPP_LINK = $(CCPP) %.o : %.c $(CC) -c -o $@ $(CFLAGS) $< -%.o : %.cpp - $(CCPP) -c -o $@ $(CCPPFLAGS) $< - %$(EXE): %.o $(OBJS) $(TEST_OBJS) $(LINK) -o $@ $(LDFLAGS) $(OBJS) $(TEST_OBJS) $< $(LIBS) @@ -335,15 +309,6 @@ CCPP_LINK = $(CCPP) %$(SO) : %.sho $(OBJS) $(LINK) -shared -o $@ $(LDFLAGS) $(LIBS) $(OBJS) $< -%.sho++ : %.cpp - $(CCPP) -c -o $@ $(SO_COMPILE_FLAGS) -DSHARED $(CCPPFLAGS) $< - -%$(SO) : %.sho++ $(OBJS) $(CPPOBJS) - $(CCPP_LINK) -shared -o $@ $(LDFLAGS) $(LIBS) $(OBJS) $(CPPOBJS) $< - BIN_OBJS = $(BINS:$(EXE)=.o) TEST_BIN_OBJS = $(TEST_BINS:$(EXE)=.o) -CPP_BIN_OBJS = $(CPP_BINS:$(EXE)=.o) -TEST_CPP_BIN_OBJS = $(TEST_CPP_BINS:$(EXE)=.o) SH_OBJS = $(OBJS:.o=.sho) -SHPP_OBJS = $(CPP_OBJS:.o=.sho++) |