X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Frules.def;h=ca59f82360a30ad4341b456d98c1872406c927b5;hb=5bfb9814f022c83d453a1244f343df2a67501a52;hp=85602532793c7291ecd245b2236a023e6e320eb7;hpb=8aec25f6496659248d997e474195ee4acdcdb976;p=feisty_meow.git diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def index 85602532..ca59f823 100644 --- a/scripts/clam/cpp/rules.def +++ b/scripts/clam/cpp/rules.def @@ -115,7 +115,7 @@ ifeq "$(COMPILER)" "GNU_DARWIN" endif ifneq "$(USE_SSL)" "" - LIBS_USED += crypto + LIBS_USED += crypto ssl endif ifneq "$(USE_WXWIDGETS)" "" @@ -246,7 +246,7 @@ ifeq "$(COMPILER)" "VISUAL_CPP" LOCAL_HEADERS += $(THIRD_PARTY_DIR)/openssl/include LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/openssl/lib LIBS_USED += libcrypto.lib libssl.lib - $(shell cp $(THIRD_PARTY_DIR)/openssl/lib/*dll $(EXECUTABLE_DIR) ) +#no, yuck. $(shell cp $(THIRD_PARTY_DIR)/openssl/lib/*dll $(EXECUTABLE_DIR) ) endif endif @@ -678,7 +678,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_BINARIES)/version_stamper$(EXE_END) . $(PARAMETER_FILE) + $(CATCHER)$(CLAM_BINARIES)/version_stamper$(EXE_END) . $(FEISTY_MEOW_GENERATED_STORE)/versions $(PARAMETER_FILE) endif endif @@ -769,10 +769,11 @@ endif # no-deps. ############################################################################ -# examines the required variables and complains if they're missing. +# examines the required variables and complains if they are missing. check_requirements: $(HIDESH) -c 'if [ -z "$(PROJECT)" ]; then echo the PROJECT variable is not defined!; . $(CLAM_SCRIPTS)/exit_make.sh; fi' $(HIDESH) -c 'if [ -z "$(TYPE)" ]; then echo the TYPE variable is not defined!; . $(CLAM_SCRIPTS)/exit_make.sh; fi' + $(HIDESH) -c 'if [ ! -d $(FEISTY_MEOW_GENERATED_STORE)/versions ]; then mkdir $(FEISTY_MEOW_GENERATED_STORE)/versions; fi' ############################################################################