X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Frules.def;h=4221047de8b5d428aa97668ea2f4ef803f24bba7;hb=68c13351f6768d8104716fc5757fbaf11bb02519;hp=7876b49f111201fe0122b0aa77f48354ab87b119;hpb=f6cd637b4e8ac3663ad196cdfa2fab088201471f;p=feisty_meow.git diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def index 7876b49f..4221047d 100644 --- a/scripts/clam/cpp/rules.def +++ b/scripts/clam/cpp/rules.def @@ -15,15 +15,6 @@ # This section manipulates variable values to prepare them for their use # in the standard CLAM support. -# special actions for projects that are tests. -ifneq "$(findstring test, $(TYPE))" "" - # add the clean task at the end, so that we will always rebuild the tests - # and run them again. -#hmmm: this is a kludge to make sure we always run the tests. there has got -# to be a better way. - LAST_TARGETS += clean -endif - # see if they have got the clean flag set. if so, we will not build anything. ifneq "$(CLEAN)" "" NO_COMPILE = t @@ -36,15 +27,46 @@ endif # implement special bits for gnu on unix. ifeq "$(COMPILER)" "GNU_LINUX" ifneq "$(USE_XWIN)" "" - ifneq "$(OP_SYSTEM)" "WIN32" - DEFINITIONS += __XWINDOWS__ __X__ - LIBS_USED += Xm Xt X11 Xft Xp + DEFINITIONS += __XWINDOWS__ __X__ + LIBS_USED += Xm Xt X11 Xft Xp #need to separate out with a USE_MOTIF kind of thing. LIBS_USED += Xmu - HEADER_SEARCH_PATH += /usr/include/X11 /usr/X11R6/include /usr/include/g++ - LIBRARY_SEARCH_PATH += /usr/X11R6/lib + HEADER_SEARCH_PATH += /usr/include/X11 /usr/X11R6/include /usr/include/g++ + LIBRARY_SEARCH_PATH += /usr/X11R6/lib + endif + + ifneq "$(USE_SSL)" "" + LIBS_USED += ssl crypto + endif + + ifneq "$(USE_WXWIDGETS)" "" + DEFINITIONS += __WXWIDGETS__ + use_unicode = + ifneq "$(findstring UNICODE, $(DEFINITIONS))" "" + use_unicode = true + endif + + # decide whether to turn on the unicode flag or not. + ifneq "$(use_unicode)" "" + DEFINITIONS += wxUSE_UNICODE + UNICODE_FLAG_ADD = --unicode=yes + else + UNICODE_FLAG_ADD = --unicode=no endif + # could add for debugging: --debug=yes + COMPILER_FLAGS += $(shell wx-config --cxxflags $(UNICODE_FLAG_ADD) ) + + LOAD_FLAG_PREFIX += $(shell wx-config --libs $(UNICODE_FLAG_ADD) ) + endif + + ifneq "$(USE_CURL)" "" + COMPILER_FLAGS += `curl-config --cflags` + LOAD_FLAG_SUFFIX += `curl-config --libs` endif +endif + +# some special code for gnu compiler on windows. +ifeq "$(COMPILER)" "GNU_WINDOWS" ifneq "$(USE_SSL)" "" LIBS_USED += ssl crypto @@ -54,9 +76,7 @@ LIBS_USED += Xmu DEFINITIONS += __WXWIDGETS__ use_unicode = ifneq "$(findstring UNICODE, $(DEFINITIONS))" "" -# ifeq "$(OP_SYSTEM)" "WIN32" - use_unicode = true -# endif + use_unicode = true endif # decide whether to turn on the unicode flag or not. @@ -74,7 +94,7 @@ LIBS_USED += Xmu ifneq "$(USE_CURL)" "" COMPILER_FLAGS += `curl-config --cflags` - LOAD_FLAG_SUFFIX += `curl-config --static-libs` + LOAD_FLAG_SUFFIX += `curl-config --libs` endif endif @@ -100,9 +120,7 @@ ifeq "$(COMPILER)" "GNU_DARWIN" DEFINITIONS += __WXWIDGETS__ use_unicode = ifneq "$(findstring UNICODE, $(DEFINITIONS))" "" -# ifeq "$(OP_SYSTEM)" "WIN32" use_unicode = true -# endif endif # decide whether to turn on the unicode flag or not. @@ -146,6 +164,7 @@ endif # win32 compiler additions. ifeq "$(OP_SYSTEM)" "WIN32" +#ifeq "$(COMPILER)" "VISUAL_CPP" # processes the def file for linkage, if one has been specified. ifneq "$(DEF_FILE)" "" LOAD_FLAG_PREFIX += -def:$(DEF_FILE) @@ -188,12 +207,11 @@ ifeq "$(OP_SYSTEM)" "WIN32" endif ifneq "$(USE_CURL)" "" + # curl wants this win32 flag? DEFINITIONS += _WIN32 LOCAL_HEADERS += $(THIRD_PARTY_DIR)/curl/include LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/curl/lib -# ifeq "$(findstring libcurl, $(LIBS_USED))" "" - LIBS_USED += libcurl.dll.a -# endif + LIBS_USED += libcurl.dll.a endif ifneq "$(VCPP_USE_GUI)" "" @@ -224,7 +242,8 @@ ifeq "$(OP_SYSTEM)" "WIN32" ifneq "$(USE_SSL)" "" LOCAL_HEADERS += $(THIRD_PARTY_DIR)/openssl/include LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/openssl/lib - LIBS_USED += libeay32.lib + LIBS_USED += libcrypto.lib libssl.lib +# LIBS_USED += libeay32.lib $(shell cp $(THIRD_PARTY_DIR)/openssl/lib/*dll $(EXECUTABLE_DIR) ) endif @@ -253,7 +272,11 @@ ifeq "$(OP_SYSTEM)" "WIN32" else TEMP_OBJ3a = $(TEMP_OBJ2) endif - TEMP_OBJ3 = $(TEMP_OBJ3a:%.rc=%.res) + ifeq "$(COMPILER)" "VISUAL_CPP" + TEMP_OBJ3 = $(TEMP_OBJ3a:%.rc=%.res) + else + TEMP_OBJ3 = $(TEMP_OBJ3a) + endif else # replace this when supporting resource files on unix. TEMP_OBJ3 = $(TEMP_OBJ2:%.rc=) @@ -284,10 +307,10 @@ COMPILER_FLAGS += $(HEADER_SEARCH_PATH:%=-I%) $(DEFINITIONS:%=-D%) $(UNDEFINITIO # to search and by adding all of the code libraries that are used. LOAD_FLAG_PREFIX += $(LIBRARY_SEARCH_PATH:%=$(LIBRARY_PATH_FLAG)%) ifeq "$(OP_SYSTEM)" "UNIX" -# ifneq "$(COMPILER)" "GNU_DARWIN" + ifneq "$(COMPILER)" "GNU_DARWIN" LOAD_FLAG_PREFIX += -Xlinker --start-group LOAD_FLAG_SUFFIX += -Xlinker --end-group -# endif + endif endif # had to switch from prefix to suffix recently. oddity. #LOAD_FLAG_PREFIX += $(LIBS_USED:%=$(LIBRARY_NAME_FLAG)%) @@ -338,12 +361,12 @@ ACTUAL_FIRST_TARGETS = check_requirements $(EXTRA_FIRST_TARGETS) $(VERSION_TARGE # Adds the primary targets to the list of products to create. ifeq "$(NO_COMPILE)" "" - ifeq "$(OP_SYSTEM)" "UNIX" + ifneq "$(COMPILER)" "VISUAL_CPP" ACTUAL_TARGETS1 = $(TARGETS:%.exe=$(EXECUTABLE_DIR)/%) else ACTUAL_TARGETS1 = $(TARGETS:%.exe=$(EXECUTABLE_DIR)/%.exe) endif - ifeq "$(OP_SYSTEM)" "UNIX" + ifneq "$(COMPILER)" "VISUAL_CPP" ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.dll=%.so) ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.so=$(DYNAMIC_LIBRARY_DIR)/%$(TRIPART_VERSION).so) else @@ -407,7 +430,7 @@ endif $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.cpp ifeq "$(NO_COMPILE)" "" ifneq "$(COMPILER)" "VISUAL_CPP" - @echo Compiling [$(shell basename $@)] + @echo Compiling [$(notdir $@)] $(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi' $(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@ else @@ -424,7 +447,7 @@ endif $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.c ifeq "$(NO_COMPILE)" "" ifneq "$(COMPILER)" "VISUAL_CPP" - @echo Compiling [$@] + @echo Compiling [$(notdir $@)] $(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi' $(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@ else @@ -470,7 +493,7 @@ endif ifeq "$(NO_COMPILE)" "" $(STATIC_LIBRARY_DIR)/%.library: $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(PARAMETER_FILE) - $(HIDER)echo Static [$@] + $(HIDER)echo Building Static Library [$(notdir $@)] @echo $@ >$(DIRTY_FILE) ifeq "$(COMPILER)" "VISUAL_CPP" $(HIDESH)-c 'if [ -f $(BUILD_LIST_FILE) ]; then $(SHELL) $(CLAM_DIR)/cpp/rebuild_oldies.sh $(MULTI_BUILD_CMD); fi' @@ -503,13 +526,15 @@ ifeq "$(NO_COMPILE)" "" $(DYNAMIC_LIBRARY_DIR)/%.dll: $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(ACTUAL_RESX) $(PARAMETER_FILE) #hmmm: use the res objects variable to rebuild res files as needed. ###$(RES_OBJECTS) - $(HIDER)echo Dynamic [$@] + $(HIDER)echo Building Dynamic Library [$(notdir $@)] @echo $@ >$(DIRTY_FILE) ifeq "$(COMPILER)" "VISUAL_CPP" $(HIDESH)-c 'if [ -f $(BUILD_LIST_FILE) ]; then $(SHELL) $(CLAM_DIR)/cpp/rebuild_oldies.sh $(MULTI_BUILD_CMD); fi' endif $(HIDER)rm -f $(@:%.dll=%.lib) + echo about to run link tool. $(CATCHER)$(LINK_TOOL) $(LINKER_OUTPUT_FLAG)$@ -dll $(LOAD_FLAG_PREFIX) $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_RESX_FLAGS) $(ACTUAL_LOCAL_LIBS:%=$(LIBRARY_NAME_FLAG)$(LIB_PREFIX)%$(LIB_ENDING)) $(LOAD_FLAG_SUFFIX) + echo ran link tool. ifeq "$(COMPILER_VERSION)" "8" $(HIDESH)$(CLAM_DIR)/cpp/ms_manifest.sh "$@" "2" endif @@ -540,14 +565,14 @@ endif #no_compile # creates "exe" executables using all of the appropriate objects. -ifeq "$(OP_SYSTEM)" "WIN32" +ifeq "$(COMPILER)" "VISUAL_CPP" ifneq "$(NO_COMPILE)" "" $(EXECUTABLE_DIR)/%.exe: endif ifeq "$(NO_COMPILE)" "" $(EXECUTABLE_DIR)/%.exe: $(OBJECT_DIR)/%.obj $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(ACTUAL_RESX) $(PARAMETER_FILE) - $(HIDER)echo Application [$@] + $(HIDER)echo Building Application [$(notdir $@)] @echo $@ >$(DIRTY_FILE) ifeq "$(COMPILER)" "VISUAL_CPP" $(HIDESH)-c 'if [ -f $(BUILD_LIST_FILE) ]; then $(SHELL) $(CLAM_DIR)/cpp/rebuild_oldies.sh $(MULTI_BUILD_CMD); fi' @@ -564,16 +589,16 @@ $(EXECUTABLE_DIR)/%.exe: $(OBJECT_DIR)/%.obj $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(HIDER)ReplaceVistaIcon "$@" "$(VCPP_VISTA_ICON)" endif endif #no_compile -endif #win32 +endif #visual studio -ifeq "$(OP_SYSTEM)" "UNIX" +ifneq "$(COMPILER)" "VISUAL_CPP" ifneq "$(NO_COMPILE)" "" $(EXECUTABLE_DIR)/%: endif ifeq "$(NO_COMPILE)" "" $(EXECUTABLE_DIR)/%: $(OBJECT_DIR)/%.obj $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(PARAMETER_FILE) - $(HIDER)echo Application [$@] + $(HIDER)echo Building Application [$(notdir $@)] @echo $@ >$(DIRTY_FILE) $(CATCHER)$(LINK_TOOL) $(EXE_FLAGS) $(LOAD_FLAG_PREFIX) $< $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(LIBRARY_NAME_FLAG)%) $(LOAD_FLAG_SUFFIX) $(LINKER_OUTPUT_FLAG)$@ #hmmm: experimental item below. @@ -591,7 +616,7 @@ endif ifeq "$(NO_COMPILE)" "" $(EXECUTABLE_DIR)/%.elf: $(OBJECT_DIR)/%.obj $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(PARAMETER_FILE) - $(HIDER)echo Application [$@] + $(HIDER)echo Building Application [$(notdir $@)] @echo $@ >$(DIRTY_FILE) $(CATCHER)$(LINK_TOOL) $(MAP) $(LOAD_FLAG_PREFIX) $< $(LINKER_COMMAND_FILE) $(STARTUP_OBJECT_FILE) $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(LIBRARY_NAME_FLAG)%) $(LOAD_FLAG_SUFFIX) $(LINKER_OUTPUT_FLAG)$@ #$(^:force_rebuild=) @@ -609,7 +634,7 @@ ifeq "$(OMIT_VERSIONS)" "" ifneq "$(VERSION_RC_ROOT)" "" # only redo the version resource if it or version.ini is out of date. %_version.rc: version.ini $(PARAMETER_FILE) - $(CATCHER)$(CLAM_BIN)/version_stamper$(EXE_END) . $(PARAMETER_FILE) + $(CATCHER)$(CLAM_BINARY_DIR)/version_stamper$(EXE_END) . $(PARAMETER_FILE) endif endif @@ -691,12 +716,12 @@ else $(DEPS_FILE): $(VERSION_RC_ROOT)_version.rc endif endif - @echo Dependencies [$(shell basename $@)] + @echo Dependencies [$(notdir $@)] -$(HIDESH)$(CLAM_DIR)/cpp/preconditions.sh @touch $@ # @echo dep adds: $(DEPENDENCY_ADDITIONS) - @$(CLAM_BIN)/makedep$(EXE_END) $(DEPENDENCY_DEFINITIONS:%=-D%) $(DEPENDENCY_ADDITIONS) -f$@ -o.obj -p$(OBJECT_DIR)/ -w 420 $(COMPILER_HEADER_DIR:%=-X%) $(THIRD_PARTY_DIR:%=-X%) -- $(COMPILER_FLAGS) $(SOURCE) $(EXE_CPPS) -# $(CATCHER)$(CLAM_BIN)/makedep$(EXE_END) $(DEPENDENCY_DEFINITIONS:%=-D%) $(DEPENDENCY_ADDITIONS) -f$@ -o.obj -p$(OBJECT_DIR)/ -w 420 $(COMPILER_HEADER_DIR:%=-X%) $(THIRD_PARTY_DIR:%=-X%) -- $(COMPILER_FLAGS) $(SOURCE) $(EXE_CPPS) + @$(CLAM_BINARY_DIR)/makedep$(EXE_END) $(DEPENDENCY_DEFINITIONS:%=-D%) $(DEPENDENCY_ADDITIONS) -f$@ -o.obj -p$(OBJECT_DIR)/ -w 420 $(COMPILER_HEADER_DIR:%=-X%) $(THIRD_PARTY_DIR:%=-X%) -- $(COMPILER_FLAGS) $(SOURCE) $(EXE_CPPS) +# $(CATCHER)$(CLAM_BINARY_DIR)/makedep$(EXE_END) $(DEPENDENCY_DEFINITIONS:%=-D%) $(DEPENDENCY_ADDITIONS) -f$@ -o.obj -p$(OBJECT_DIR)/ -w 420 $(COMPILER_HEADER_DIR:%=-X%) $(THIRD_PARTY_DIR:%=-X%) -- $(COMPILER_FLAGS) $(SOURCE) $(EXE_CPPS) @echo $@ >$(SUBMAKE_FLAG) endif # non-compile. endif # no-deps.