Merge authors: poy (poy) ------------------------------------------------------------ revno: 16 [merge] committer: poy <p...@123gen.com> branch nick: ExamplePlugin timestamp: Mon 2013-05-13 19:40:56 +0200 message: merge modified: .bzrignore doc/Plugin format (dcext).txt pluginsdk/PluginDefs.h projects/make/Makefile
-- 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 '.bzrignore' --- .bzrignore 2013-02-05 19:21:52 +0000 +++ .bzrignore 2013-04-28 21:07:59 +0000 @@ -12,7 +12,7 @@ ./doc/build.bat ./doc/html ./doc/latex -./projects/make/build +./projects/make/build* ./projects/vs2010/Debug ./projects/vs2010/ipch ./projects/vs2010/Release === modified file 'doc/Plugin format (dcext).txt' --- doc/Plugin format (dcext).txt 2013-04-23 18:11:29 +0000 +++ doc/Plugin format (dcext).txt 2013-05-13 17:39:48 +0000 @@ -15,8 +15,13 @@ Shared extensions are fine for testing but impractical to distribute and to have users install. Therefore, a DC plugin is preferably packaged as a .dcext file. -A .dcext file is an archive. Currently, it is required to be a tar file, either uncompressed or -compressed with bzip2 or gzip. This may be expanded in the future if needed. +A .dcext file is a ZIP archive, as defined by PKWARE's APPNOTE, either uncompressed (method 0) or +compressed with DEFLATE (method 8), with the following restrictions: +- No encryption. +- No streaming / splitting / spanning. +- No manifest file. +- No character outside of the ASCII range in file names. +- Extensions / extra fields and comments are allowed but shall be ignored. That archive must contain an XML file named "info.xml" at its root, whose contents shall validate against the schemas/dcext.xsd schema. === modified file 'pluginsdk/PluginDefs.h' --- pluginsdk/PluginDefs.h 2013-04-23 18:11:29 +0000 +++ pluginsdk/PluginDefs.h 2013-05-13 17:17:45 +0000 @@ -444,11 +444,12 @@ /* Add a command identified by "name". "icon" is optional; it is the path to an icon file used to illustrate the command. */ - void (DCAPI *add_command) (const char* name, DCCommandFunc command, const char* icon); + void (DCAPI *add_command) (const char* guid, const char* name, DCCommandFunc command, const char* icon); /* Remove a command previously added with add_command. */ - void (DCAPI *remove_command) (const char* name); + void (DCAPI *remove_command) (const char* guid, const char* name); void (DCAPI *play_sound) (const char* path); + void (DCAPI *notify) (const char* title, const char* message); } DCUI, *DCUIPtr; #ifdef __cplusplus === modified file 'projects/make/Makefile' --- projects/make/Makefile 2013-04-26 15:13:03 +0000 +++ projects/make/Makefile 2013-05-13 17:40:56 +0000 @@ -23,7 +23,9 @@ src/Plugin.o \ src/stdafx.o -ifeq ($(findstring mingw, $(shell gcc -dumpmachine)),) +COMPILER_SPEC = $(shell $(CC) -dumpmachine) + +ifeq ($(findstring mingw, $(COMPILER_SPEC)),) LIBEXT = .so else CPPFLAGS += -D_WIN32_WINNT=0x502 -DWINVER=0x502 -D_WIN32_IE=0x600 \ @@ -34,7 +36,7 @@ OUTPUT_DIR := $(OUTPUT_DIR)-mingw endif -ifeq ($(findstring x86_64, $(shell gcc -dumpmachine)),) +ifeq ($(findstring x86_64, $(COMPILER_SPEC)),) CPPFLAGS += -march=i686 OUTPUT_DIR := $(OUTPUT_DIR)-x86 else
_______________________________________________ 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
