Merge authors:
poy (poy)
------------------------------------------------------------
revno: 5 [merge]
committer: poy <p...@123gen.com>
branch nick: DevPlugin
timestamp: Fri 2012-11-16 18:27:22 +0100
message:
merge - builds fine now
modified:
projects/make/Makefile
projects/vs2010/Plugin.vcxproj
projects/vs2012/Plugin.vcxproj
--
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 2012-11-16 17:17:12 +0000
+++ projects/make/Makefile 2012-11-16 17:27:22 +0000
@@ -1,7 +1,9 @@
# This is a rudimentary Makefile that compiles files from the pluginsdk & src directories into a
# shared library. Adapt to your needs.
-TARGET = DevPlugin
+TARGET = DevPlugin # Rename to your plugin's name.
+
+CPPFLAGS += -march=i686 # Remove if your target architecture is not x86.
CPPFLAGS += -Wall -Wextra -g -pipe -O3 -I../../
CXXFLAGS += -std=gnu++0x
=== modified file 'projects/vs2010/Plugin.vcxproj'
--- projects/vs2010/Plugin.vcxproj 2012-11-16 17:17:12 +0000
+++ projects/vs2010/Plugin.vcxproj 2012-11-16 17:27:22 +0000
@@ -18,10 +18,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -134,4 +136,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
=== modified file 'projects/vs2012/Plugin.vcxproj'
--- projects/vs2012/Plugin.vcxproj 2012-11-16 17:17:12 +0000
+++ projects/vs2012/Plugin.vcxproj 2012-11-16 17:27:22 +0000
@@ -19,11 +19,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
_______________________________________________
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
