Merge authors: poy (poy) ------------------------------------------------------------ revno: 16 [merge] committer: poy <p...@123gen.com> branch nick: DevPlugin timestamp: Sun 2013-02-03 22:36:10 +0100 message: merge modified: projects/make/Makefile
-- lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/DevPlugin https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/DevPlugin Your team Dcplusplus-team is subscribed to branch lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/DevPlugin. To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/DevPlugin/+edit-subscription
=== modified file 'projects/make/Makefile' --- projects/make/Makefile 2013-01-29 18:42:08 +0000 +++ projects/make/Makefile 2013-02-03 21:36:10 +0000 @@ -36,8 +36,17 @@ -DWIN32 -D_WIN32 -DUNICODE -D_UNICODE OBJS += src/resource.o LIBEXT = .dll + ifeq ($(findstring Cygwin, $(SHELL)),) + MKDIR = if not exist $(subst /,\,$1) md $(subst /,\,$1) + RMDIR = if exist $(subst /,\,$1) rd /s /q $(subst /,\,$1) + else + MKDIR = mkdir -p $1 + RMDIR += $(RM) -r $1 + endif else LIBEXT = .so + MKDIR = mkdir -p $1 + RMDIR += $(RM) -r $1 endif # boost @@ -101,12 +110,15 @@ cd $(OUTPUT_DIR); $(CXX) $^ $(LINKFLAGS) -o $@$(LIBEXT) ensure-dirs: - mkdir -p $(OUTPUT_DIR)/pluginsdk $(OUTPUT_DIR)/src \ - $(OUTPUT_DIR)/boost/libs/atomic/src $(OUTPUT_DIR)/boost/libs/regex/src \ - $(OUTPUT_DIR)/dwt/src/util/win32 $(OUTPUT_DIR)/dwt/src/widgets + $(call MKDIR,$(OUTPUT_DIR)/pluginsdk) + $(call MKDIR,$(OUTPUT_DIR)/src) + $(call MKDIR,$(OUTPUT_DIR)/boost/libs/atomic/src) + $(call MKDIR,$(OUTPUT_DIR)/boost/libs/regex/src) + $(call MKDIR,$(OUTPUT_DIR)/dwt/src/util/win32) + $(call MKDIR,$(OUTPUT_DIR)/dwt/src/widgets) src/resource.o: windres ../../src/resource.rc $(OUTPUT_OPTION) clear: - $(RM) -r $(OUTPUT_DIR) + $(call RMDIR,$(OUTPUT_DIR))
_______________________________________________ Mailing list: https://launchpad.net/~linuxdcpp-team Post to : linuxdcpp-team@lists.launchpad.net Unsubscribe : https://launchpad.net/~linuxdcpp-team More help : https://help.launchpad.net/ListHelp
