# 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
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.
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.
# 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)
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)" ""
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
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=)
# 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
$(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.cpp
ifeq "$(NO_COMPILE)" ""
ifneq "$(COMPILER)" "VISUAL_CPP"
- @echo Building [$(shell basename $@)]
+ @echo Compiling [$(notdir $@)]
$(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi'
$(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@
else
$(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.c
ifeq "$(NO_COMPILE)" ""
ifneq "$(COMPILER)" "VISUAL_CPP"
- @echo Building [$@]
+ @echo Compiling [$(notdir $@)]
$(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi'
$(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@
else
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'
$(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'
# 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'
$(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.
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=)
$(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)