Merge authors:
poy (poy)
------------------------------------------------------------
revno: 3 [merge]
committer: poy <p...@123gen.com>
branch nick: DevPlugin
timestamp: Fri 2012-11-16 17:50:35 +0100
message:
build fixes
modified:
projects/make/Makefile
projects/vs2010/Plugin.vcxproj
projects/vs2010/Plugin.vcxproj.filters
projects/vs2012/Plugin.vcxproj
projects/vs2012/Plugin.vcxproj.filters
--
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-15 18:17:16 +0000
+++ projects/make/Makefile 2012-11-16 16:50:35 +0000
@@ -1,32 +1,38 @@
# This is a rudimentary Makefile that compiles files from the pluginsdk & src directories into a
# shared library. Adapt to your needs.
-CXX = $(PREFIX)g++$(SUFFIX)
-CXXFLAGS += -std=gnu++0x -Wall -Wextra -g -pipe -O3 -I../../
+TARGET = DevPlugin
+
+CPPFLAGS += -Wall -Wextra -g -pipe -O3 -I../../
+CXXFLAGS += -std=gnu++0x
LINKFLAGS += -static-libgcc -static-libstdc++ -g -O3 -shared -Wl,--add-stdcall-alias
-VPATH = ../../pluginsdk:../../src
+VPATH = ../../
OUTPUT_DIR = build
OUTPUT_OPTION = -o $(OUTPUT_DIR)/$@
OBJS = \
- Config.o \
- Connections.o \
- Core.o \
- Hooks.o \
- Hubs.o \
- Logger.o \
- Queue.o \
- Tagger.o \
- UI.o \
- Util.o \
- main.o \
- Plugin.o \
- stdafx.o
+ pluginsdk/Config.o \
+ pluginsdk/Connections.o \
+ pluginsdk/Core.o \
+ pluginsdk/Hooks.o \
+ pluginsdk/Hubs.o \
+ pluginsdk/Logger.o \
+ pluginsdk/Queue.o \
+ pluginsdk/Tagger.o \
+ pluginsdk/UI.o \
+ pluginsdk/Util.o \
+ src/Dialog.o \
+ src/main.o \
+ src/Plugin.o \
+ src/stdafx.o
ifeq ($(OS), Windows_NT)
- OBJS += resource.o
+ CPPFLAGS += -D_WIN32_WINNT=0x502 -DWINVER=0x502 -D_WIN32_IE=0x600 \
+ -DNOMINMAX -DSTRICT -DWIN32_LEAN_AND_MEAN \
+ -DWIN32 -D_WIN32 -DUNICODE -D_UNICODE
+ OBJS += src/resource.o
LIBEXT = .dll
else
LIBEXT = .so
@@ -34,15 +40,15 @@
all: \
ensure-dirs \
- Plugin
+ $(TARGET)
-Plugin: $(OBJS)
+$(TARGET): $(OBJS)
cd $(OUTPUT_DIR); $(CXX) $(LINKFLAGS) -o $@$(LIBEXT) $^
ensure-dirs:
- mkdir -p $(OUTPUT_DIR)
+ mkdir -p $(OUTPUT_DIR)/pluginsdk $(OUTPUT_DIR)/src
-resource.o: resource.rc
+src/resource.o:
windres ../../src/resource.rc $(OUTPUT_OPTION)
clear:
=== modified file 'projects/vs2010/Plugin.vcxproj'
--- projects/vs2010/Plugin.vcxproj 2012-11-15 18:17:16 +0000
+++ projects/vs2010/Plugin.vcxproj 2012-11-16 16:50:35 +0000
@@ -35,9 +35,11 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
+ <TargetName>DevPlugin</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
+ <TargetName>DevPlugin</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -85,6 +87,7 @@
<ClCompile Include="..\..\pluginsdk\Tagger.cpp" />
<ClCompile Include="..\..\pluginsdk\UI.cpp" />
<ClCompile Include="..\..\pluginsdk\Util.cpp" />
+ <ClCompile Include="..\..\src\Dialog.cpp" />
<ClCompile Include="..\..\src\main.cpp" />
<ClCompile Include="..\..\src\Plugin.cpp" />
<ClCompile Include="..\..\src\stdafx.cpp" />
@@ -101,6 +104,7 @@
<ClInclude Include="..\..\pluginsdk\Tagger.h" />
<ClInclude Include="..\..\pluginsdk\UI.h" />
<ClInclude Include="..\..\pluginsdk\Util.h" />
+ <ClInclude Include="..\..\src\Dialog.h" />
<ClInclude Include="..\..\src\Plugin.h" />
<ClInclude Include="..\..\src\resource.h" />
<ClInclude Include="..\..\src\stdafx.h" />
@@ -112,4 +116,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
=== modified file 'projects/vs2010/Plugin.vcxproj.filters'
--- projects/vs2010/Plugin.vcxproj.filters 2012-11-15 18:17:16 +0000
+++ projects/vs2010/Plugin.vcxproj.filters 2012-11-16 16:50:35 +0000
@@ -60,6 +60,9 @@
<ClCompile Include="..\..\pluginsdk\Tagger.cpp">
<Filter>Source Files\Plugin SDK</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\Dialog.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\Plugin.h">
@@ -107,6 +110,9 @@
<ClInclude Include="..\..\pluginsdk\PluginDefs.h">
<Filter>Header Files\Plugin SDK</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\Dialog.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\resource.rc">
=== modified file 'projects/vs2012/Plugin.vcxproj'
--- projects/vs2012/Plugin.vcxproj 2012-11-15 18:17:16 +0000
+++ projects/vs2012/Plugin.vcxproj 2012-11-16 16:50:35 +0000
@@ -37,9 +37,11 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
+ <TargetName>DevPlugin</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
+ <TargetName>DevPlugin</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -87,6 +89,7 @@
<ClCompile Include="..\..\pluginsdk\Tagger.cpp" />
<ClCompile Include="..\..\pluginsdk\UI.cpp" />
<ClCompile Include="..\..\pluginsdk\Util.cpp" />
+ <ClCompile Include="..\..\src\Dialog.cpp" />
<ClCompile Include="..\..\src\main.cpp" />
<ClCompile Include="..\..\src\Plugin.cpp" />
<ClCompile Include="..\..\src\stdafx.cpp" />
@@ -103,6 +106,7 @@
<ClInclude Include="..\..\pluginsdk\Tagger.h" />
<ClInclude Include="..\..\pluginsdk\UI.h" />
<ClInclude Include="..\..\pluginsdk\Util.h" />
+ <ClInclude Include="..\..\src\Dialog.h" />
<ClInclude Include="..\..\src\Plugin.h" />
<ClInclude Include="..\..\src\resource.h" />
<ClInclude Include="..\..\src\stdafx.h" />
=== modified file 'projects/vs2012/Plugin.vcxproj.filters'
--- projects/vs2012/Plugin.vcxproj.filters 2012-11-15 18:17:16 +0000
+++ projects/vs2012/Plugin.vcxproj.filters 2012-11-16 16:50:35 +0000
@@ -60,6 +60,9 @@
<ClCompile Include="..\..\pluginsdk\Tagger.cpp">
<Filter>Source Files\Plugin SDK</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\Dialog.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\Plugin.h">
@@ -107,6 +110,9 @@
<ClInclude Include="..\..\pluginsdk\PluginDefs.h">
<Filter>Header Files\Plugin SDK</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\Dialog.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\resource.rc">
_______________________________________________
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
