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`
endif
# win32 compiler additions.
-ifeq "$(OP_SYSTEM)" "WIN32"
-#ifeq "$(COMPILER)" "VISUAL_CPP"
+#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
+# # curl wants this win32 flag?
+ DEFINITIONS += WIN32
LOCAL_HEADERS += $(THIRD_PARTY_DIR)/curl/include
LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/curl/lib
- LIBS_USED += libcurl.dll.a
+# LIBS_USED += libcurl.dll.a
+ LIBS_USED += libcurl.lib
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
$(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:%)
# 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=)
# 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
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))" ""
GENERATED_DEPS_LIST = $(TARGETS:%.exe=%.gendeps)
endif
+endif
+
# Make sure that the directory for objects exists.
ACTUAL_FIRST_TARGETS = check_requirements $(EXTRA_FIRST_TARGETS) $(VERSION_TARGET) $(FIRST_TARGETS) pre_compilation
$(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.cpp
ifeq "$(NO_COMPILE)" ""
ifneq "$(COMPILER)" "VISUAL_CPP"
- @echo Building [$(shell basename $@)]
+ @echo Compiling Object [$(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 Object [$(notdir $@)]
$(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi'
$(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@
else
# resource compiler for win32.
-ifeq "$(OP_SYSTEM)" "WIN32"
+ifeq "$(COMPILER)" "VISUAL_CPP"
$(OBJECT_DIR)/%.res: %.rc $(PARAMETER_FILE)
ifeq "$(NO_COMPILE)" ""
@echo Resource [$@]
$(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)" ""
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'
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'
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=)
# 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)
+ifeq "$(CLEAN)" ""
+ ifeq "$(NO_DEPS)" ""
+ include $(DEPS_FILE)
+ endif
endif
# preserves intermediate files from being deleted.
$(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)