------------------------------------------------------------
revno: 31
committer: poy <p...@123gen.com>
branch nick: dcpp-plugin-sdk-cpp
timestamp: Sun 2013-06-16 20:47:56 +0200
message:
append the arch to the target name & update VS2010 projects
modified:
projects/make/Makefile
projects/vs2010/Plugin.vcxproj
projects/vs2012/Plugin.vcxproj
--
lp:dcpp-plugin-sdk-cpp
https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/trunk
Your team Dcplusplus-team is subscribed to branch lp:dcpp-plugin-sdk-cpp.
To unsubscribe from this branch go to
https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/trunk/+edit-subscription
=== modified file 'projects/make/Makefile'
--- projects/make/Makefile 2013-06-16 18:30:11 +0000
+++ projects/make/Makefile 2013-06-16 18:47:56 +0000
@@ -44,15 +44,15 @@
LIBEXT = .dll
OBJS += src/resource.o
OUTPUT_DIR := $(OUTPUT_DIR)-mingw
- RCFLAGS := -DPLUGIN_FILE_NAME="\\\"$(TARGET)\\\"" \
- -DPLUGIN_FILE_NAME_EXT="\\\"$(TARGET)$(LIBEXT)\\\""
endif
ifeq ($(findstring x86_64, $(COMPILER_SPEC)),)
CPPFLAGS += -march=i686
OUTPUT_DIR := $(OUTPUT_DIR)-x86
+ TARGET := $(TARGET)-x86
else
OUTPUT_DIR := $(OUTPUT_DIR)-x64
+ TARGET := $(TARGET)-x64
endif
ifeq ($(OS), Windows_NT)
@@ -72,6 +72,8 @@
PDB =
else
PDB := $(OUTPUT_DIR)/$(TARGET).pdb
+ RCFLAGS := -DPLUGIN_FILE_NAME="\\\"$(TARGET)\\\"" \
+ -DPLUGIN_FILE_NAME_EXT="\\\"$(TARGET)$(LIBEXT)\\\""
endif
TARGET := $(OUTPUT_DIR)/$(TARGET)$(LIBEXT)
=== modified file 'projects/vs2010/Plugin.vcxproj'
--- projects/vs2010/Plugin.vcxproj 2013-05-23 16:06:31 +0000
+++ projects/vs2010/Plugin.vcxproj 2013-06-16 18:47:56 +0000
@@ -61,19 +61,19 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>MyPlugin</TargetName>
+ <TargetName>MyPlugin-$(PROCESSOR_ARCHITECTURE)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>MyPlugin</TargetName>
+ <TargetName>MyPlugin-$(PROCESSOR_ARCHITECTURE)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>MyPlugin</TargetName>
+ <TargetName>MyPlugin-$(PROCESSOR_ARCHITECTURE)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>MyPlugin</TargetName>
+ <TargetName>MyPlugin-$(PROCESSOR_ARCHITECTURE)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -91,6 +91,9 @@
<SubSystem>Windows</SubSystem>
<AdditionalOptions>/EXPORT:pluginInit %(AdditionalOptions)</AdditionalOptions>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>PLUGIN_FILE_NAME="\"$(TargetName)\"";PLUGIN_FILE_NAME_EXT="\"$(TargetFileName)\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@@ -107,6 +110,9 @@
<SubSystem>Windows</SubSystem>
<AdditionalOptions>/EXPORT:pluginInit %(AdditionalOptions)</AdditionalOptions>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>PLUGIN_FILE_NAME="\"$(TargetName)\"";PLUGIN_FILE_NAME_EXT="\"$(TargetFileName)\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -125,6 +131,9 @@
<OptimizeReferences>true</OptimizeReferences>
<AdditionalOptions>/EXPORT:pluginInit %(AdditionalOptions)</AdditionalOptions>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>PLUGIN_FILE_NAME="\"$(TargetName)\"";PLUGIN_FILE_NAME_EXT="\"$(TargetFileName)\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@@ -142,6 +151,9 @@
<OptimizeReferences>true</OptimizeReferences>
<AdditionalOptions>/EXPORT:pluginInit %(AdditionalOptions)</AdditionalOptions>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>PLUGIN_FILE_NAME="\"$(TargetName)\"";PLUGIN_FILE_NAME_EXT="\"$(TargetFileName)\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\pluginsdk\Config.cpp" />
=== modified file 'projects/vs2012/Plugin.vcxproj'
--- projects/vs2012/Plugin.vcxproj 2013-06-16 18:30:11 +0000
+++ projects/vs2012/Plugin.vcxproj 2013-06-16 18:47:56 +0000
@@ -65,19 +65,19 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>MyPlugin</TargetName>
+ <TargetName>MyPlugin-$(PROCESSOR_ARCHITECTURE)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>MyPlugin</TargetName>
+ <TargetName>MyPlugin-$(PROCESSOR_ARCHITECTURE)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>MyPlugin</TargetName>
+ <TargetName>MyPlugin-$(PROCESSOR_ARCHITECTURE)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>MyPlugin</TargetName>
+ <TargetName>MyPlugin-$(PROCESSOR_ARCHITECTURE)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
_______________________________________________
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
