[vidalia-svn] r3846: Make Steve's static plugins build. (in vidalia/branches/extension-api/src: . plugins/HomePlugin)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-06-13 18:06:44 -0400 (Sat, 13 Jun 2009)
New Revision: 3846

Modified:
   vidalia/branches/extension-api/src/CMakeLists.txt
   vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt
   vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.cpp
Log:

Make Steve's static plugins build.


Modified: vidalia/branches/extension-api/src/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/CMakeLists.txt	2009-06-13 21:10:32 UTC (rev 3845)
+++ vidalia/branches/extension-api/src/CMakeLists.txt	2009-06-13 22:06:44 UTC (rev 3846)
@@ -21,7 +21,7 @@
 link_directories(
   ${CMAKE_CURRENT_BINARY_DIR}/torcontrol
   ${CMAKE_CURRENT_BINARY_DIR}/common
-  ${CMAKE_CURRENT_SOURCE_DIR}/plugins
+  ${CMAKE_CURRENT_SOURCE_DIR}/plugins/HomePlugin
 )
 
 if(MSVC)
@@ -36,6 +36,8 @@
   endif(NOT QT_CONFIG MATCHES "static")
 endif(WIN32)
 
+add_definitions(-DQT_STATICPLUGIN)
+
 if (USE_MINIUPNPC)
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/miniupnpc)
   link_directories(${CMAKE_CURRENT_BINARY_DIR}/miniupnpc)

Modified: vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt	2009-06-13 21:10:32 UTC (rev 3845)
+++ vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt	2009-06-13 22:06:44 UTC (rev 3846)
@@ -19,5 +19,5 @@
 )
 
 add_library(homeplugin STATIC  ${homeplugin_SRCS})
-target_link_libraries(homeplugin ${QT_LIBRARIES} common)
+target_link_libraries(homeplugin ${QT_LIBRARIES})
 

Modified: vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.cpp
===================================================================
--- vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.cpp	2009-06-13 21:10:32 UTC (rev 3845)
+++ vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.cpp	2009-06-13 22:06:44 UTC (rev 3846)
@@ -24,7 +24,9 @@
 {
 }
 
-QString panelName() {
+QString
+HomePlugin::panelName()
+{
   QString bob("bob");
   return bob;
 }