Merge authors:
poy (poy)
------------------------------------------------------------
revno: 11 [merge]
committer: poy <p...@123gen.com>
branch nick: ExamplePlugin
timestamp: Sun 2013-02-03 22:33:00 +0100
message:
merge
modified:
projects/make/Makefile
src/resource.rc
--
lp:~dcplusplus-team/dcpp-plugin-sdk-c/ExamplePlugin
https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-c/ExamplePlugin
Your team Dcplusplus-team is subscribed to branch
lp:~dcplusplus-team/dcpp-plugin-sdk-c/ExamplePlugin.
To unsubscribe from this branch go to
https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-c/ExamplePlugin/+edit-subscription
=== modified file 'projects/make/Makefile'
--- projects/make/Makefile 2012-12-27 21:29:11 +0000
+++ projects/make/Makefile 2013-02-03 21:33:00 +0000
@@ -26,8 +26,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
all: \
@@ -38,10 +47,11 @@
cd $(OUTPUT_DIR); $(CC) $^ $(LINKFLAGS) -o $@$(LIBEXT)
ensure-dirs:
- mkdir -p $(OUTPUT_DIR)/pluginsdk $(OUTPUT_DIR)/src
+ $(call MKDIR,$(OUTPUT_DIR)/pluginsdk)
+ $(call MKDIR,$(OUTPUT_DIR)/src)
src/resource.o:
windres ../../src/resource.rc $(OUTPUT_OPTION)
clear:
- $(RM) -r $(OUTPUT_DIR)
+ $(call RMDIR,$(OUTPUT_DIR))
=== modified file 'src/resource.rc'
--- src/resource.rc 2012-12-27 21:29:11 +0000
+++ src/resource.rc 2013-02-03 21:33:00 +0000
@@ -71,7 +71,7 @@
VALUE "FileDescription", "Example plugin for DC++"
VALUE "FileVersion", "1, 0, 0, 0"
VALUE "InternalName", "ExamplePlugin"
- VALUE "LegalCopyright", "Copyright (C) 2012 Jacek Sieka"
+ VALUE "LegalCopyright", "Copyright (C) 2012-2013 Jacek Sieka"
VALUE "OriginalFilename", "ExamplePlugin.dll"
VALUE "ProductName", "Example plugin for DC++"
VALUE "ProductVersion", "1, 0, 0, 0"
_______________________________________________
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
