X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Frules.def;h=73efdfd463d00e330bbd11d40777e0797ff4bc1d;hb=d87617f212d9dff8d5033b81e19a0740846999fe;hp=6e5651627c0300dda0b5e107906332b3534162ca;hpb=9e59368ce8d72bba7dedacf9bc4288e46c4ce9cd;p=feisty_meow.git diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def index 6e565162..73efdfd4 100644 --- a/scripts/clam/cpp/rules.def +++ b/scripts/clam/cpp/rules.def @@ -27,16 +27,47 @@ 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 endif @@ -45,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. @@ -63,6 +92,8 @@ LIBS_USED += Xmu LOAD_FLAG_PREFIX += $(shell wx-config --libs $(UNICODE_FLAG_ADD) ) endif +LOAD_FLAG_PREFIX += -lwsock32 -lmswsock -shared + ifneq "$(USE_CURL)" "" COMPILER_FLAGS += `curl-config --cflags` LOAD_FLAG_SUFFIX += `curl-config --libs` @@ -91,9 +122,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. @@ -136,7 +165,8 @@ ifneq "$(OP_SYSTEM)" "WIN32" endif # win32 compiler additions. -ifeq "$(OP_SYSTEM)" "WIN32" +#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) @@ -179,12 +209,12 @@ ifeq "$(OP_SYSTEM)" "WIN32" endif ifneq "$(USE_CURL)" "" - DEFINITIONS += _WIN32 +# # 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 + LIBS_USED += libcurl.lib endif ifneq "$(VCPP_USE_GUI)" "" @@ -215,13 +245,14 @@ 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 $(shell cp $(THIRD_PARTY_DIR)/openssl/lib/*dll $(EXECUTABLE_DIR) ) endif endif -ifeq "$(OP_SYSTEM)" "WIN32" +#ifeq "$(OP_SYSTEM)" "WIN32" +ifeq "$(COMPILER)" "VISUAL_CPP" # prep the actual source variable so that certain file names are translated. ACTUAL_RESX = $(RESX:%.resx=$(OBJECT_DIR)/%.resources) ACTUAL_RESX_FLAGS = $(ACTUAL_RESX:%=-ASSEMBLYLINKRESOURCE:%) @@ -237,14 +268,18 @@ ACTUAL_LOCAL_LIBS = $(TEMP_LOC1) # Create the list of objects from the list of source files. TEMP_OBJ1 = $(SOURCE:%.cpp=%.obj) TEMP_OBJ2 = $(TEMP_OBJ1:%.c=%.obj) -ifeq "$(OP_SYSTEM)" "WIN32" +ifeq "$(COMPILER)" "VISUAL_CPP" ifneq "$(OMIT_VERSIONS)" "" # remove version rc files if we're not dealing with versions. TEMP_OBJ3a = $(TEMP_OBJ2:%_version.rc=) 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=) @@ -300,7 +335,8 @@ MULTI_BUILD_CMD = $(CC) $(COMPILER_FLAGS) -c `cat $(BUILD_LIST_FILE)` $(OBJECT_N # support for allocations; if regular new and DEBUG_NEW get mixed together, # crashes used to result. supposedly these are gone now at least. ifneq "$(USE_MFC)" "" - ifeq "$(OP_SYSTEM)" "WIN32" +# ifeq "$(OP_SYSTEM)" "WIN32" + ifeq "$(COMPILER)" "VISUAL_CPP" # set the flag that says we are doing mfc extension dlls. DEFINITIONS += _AFXDLL DEPENDENCY_DEFINITIONS += _MT _DLL @@ -314,14 +350,20 @@ ifeq "$(OMIT_VERSIONS)" "" endif endif -ifneq "$(GENDEPS)" "" - EXTRA_FIRST_TARGETS += gendeps -endif +# if we are cleaning up, then do not generate dependency file. +ifeq "$(CLEAN)" "" + ifneq "$(GENDEPS)" "" + EXTRA_FIRST_TARGETS += gendeps + endif # only do the deps generation for makefiles that are properly marked. ifneq "$(findstring __BUILD_STATIC_APPLICATION__, $(DEFINITIONS))" "" # generate static build dependencies for all targets in the makefile. GENERATED_DEPS_LIST = $(TARGETS:%.exe=%.gendeps) +else + GENERATED_DEPS_LIST = +endif + endif # Make sure that the directory for objects exists. @@ -329,12 +371,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 @@ -384,10 +426,12 @@ endif # $(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$(TEMP)/$@ #endif +ifeq "$(CLEAN)" "" # recreate dependencies for static applications. %.gendeps: %.cpp @echo "Generating Static Deps: $*.cpp" $(CATCHER)$(CLAM_DIR)/cpp/buildor_gen_deps.sh "$*.cpp" +endif ############################################################################ @@ -398,7 +442,7 @@ endif $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.cpp ifeq "$(NO_COMPILE)" "" ifneq "$(COMPILER)" "VISUAL_CPP" - @echo Compiling [$(shell basename $@)] + @echo Compiling Object [$(notdir $@)] $(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi' $(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@ else @@ -415,7 +459,7 @@ endif $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.c ifeq "$(NO_COMPILE)" "" ifneq "$(COMPILER)" "VISUAL_CPP" - @echo Compiling [$@] + @echo Compiling Object [$(notdir $@)] $(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi' $(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@ else @@ -429,7 +473,7 @@ endif # resource compiler for win32. -ifeq "$(OP_SYSTEM)" "WIN32" +ifeq "$(COMPILER)" "VISUAL_CPP" $(OBJECT_DIR)/%.res: %.rc $(PARAMETER_FILE) ifeq "$(NO_COMPILE)" "" @echo Resource [$@] @@ -443,7 +487,7 @@ $(OBJECT_DIR)/%.resources: %.resx $(PARAMETER_FILE) $(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi' $(VCS_ROOT)/../SDK/v1.1/bin/resgen $< $@ endif -else #non-win32 +else #non-visual studio # this platform probably does not use rc files. $(OBJECT_DIR)/%.res: %.rc ifeq "$(NO_COMPILE)" "" @@ -461,7 +505,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' @@ -494,13 +538,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 @@ -531,14 +577,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' @@ -555,16 +601,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. @@ -582,7 +628,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=) @@ -600,7 +646,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 @@ -621,7 +667,7 @@ endif ifneq "$(CLEAN)" "" NO_DEPS = t # no dependencies get left when we are cleaning up. - $(shell rm -f $(DEPS_FILE)) +# $(shell rm -f $(DEPS_FILE)) endif ifneq "$(NO_COMPILE)" "" # non compiling projects do not need dependencies. @@ -633,15 +679,10 @@ ifneq "$(REBUILD)" "" $(shell rm -f $(DEPS_FILE)) endif -# includes the auto-dependency information. the dependency file is checked -# for being up-to-date. if not, it gets rebuilt and the make is restarted. -ifeq "$(NO_DEPS)" "" - include $(DEPS_FILE) -endif - # preserves intermediate files from being deleted. ifeq "$(CLEAN)" "" -.PRECIOUS: $(OBJECT_DIR)/%.obj $(OBJECT_DIR)/%.res $(OBJECT_DIR)/%.resources +.PRECIOUS: $(OBJECT_DIR)/%.obj $(OBJECT_DIR)/%.res $(OBJECT_DIR)/%.resources $(OBJECT_DIR)/%.deps +#hmmm: added above deps. maybe not right. endif # zaps things when they could not be created correctly. @@ -659,6 +700,7 @@ ifneq "$(NO_DEPS)" "" $(DEPS_FILE): $(PARAMETER_FILE) else + ifeq "$(CLEAN)" "" deps: $(DEPS_FILE) # this causes the dependency file to be regenerated if the sources or libs @@ -682,14 +724,20 @@ 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. + else # cleaning. + # makes the dependencies a no-op for cleaning. + deps: $(PARAMETER_FILE) + + $(DEPS_FILE): $(PARAMETER_FILE) + endif endif # no-deps. ############################################################################ @@ -701,6 +749,22 @@ check_requirements: ############################################################################ +# includes the auto-dependency information. the dependency file is checked +# for being up-to-date. if not, it gets rebuilt and the make is restarted. +ifeq "$(CLEAN)" "" + ifeq "$(NO_DEPS)" "" + + # thank the buddha for this bit of code, or at least thank this page: + # http://stackoverflow.com/questions/5553352/how-do-i-check-if-file-exists-in-makefile + ifneq ("$(wildcard $(DEPS_FILE))","") + include $(DEPS_FILE) + endif + + endif +endif + +############################################################################ + # calls the script for preparing output directories and such. pre_compilation: $(HIDESH)$(CLAM_DIR)/cpp/preconditions.sh