X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Frules.def;h=ee8c7d6ff383413edaf0f2b810f716c6ad98009e;hb=5e22301c1dab2d8fb437c02d1adeb823bfcd972a;hp=aea2b4a056dbc6996ce9e298e04e6dd1e750b803;hpb=2a3a67a56b96e32b09e50e8ca9f29416fe42eff7;p=feisty_meow.git diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def index aea2b4a0..ee8c7d6f 100644 --- a/scripts/clam/cpp/rules.def +++ b/scripts/clam/cpp/rules.def @@ -65,7 +65,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 @@ -500,7 +500,9 @@ $(DYNAMIC_LIBRARY_DIR)/%.dll: $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL $(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