Revision: 1566
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1566&view=rev
Author: rorthomas
Date: 2011-01-15 22:29:34 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
finding wxwidgets on its own again
Modified Paths:
--------------
trunk/source/viewer/CMakeLists.txt
Modified: trunk/source/viewer/CMakeLists.txt
===================================================================
--- trunk/source/viewer/CMakeLists.txt 2011-01-15 22:29:15 UTC (rev 1565)
+++ trunk/source/viewer/CMakeLists.txt 2011-01-15 22:29:34 UTC (rev 1566)
@@ -1,8 +1,11 @@
project(RoR_Viewer)
# find wxWidgets
-include_directories(${WXWIDGETS_SHARED_INCLUDE_DIRS})
-link_directories (${WXWIDGETS_SHARED_LIBRARY_DIRS})
+SET(wxWidgets_USE_UNICODE ON)
+FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS base core html net adv propgrid aui)
+include_directories(${wxWidgets_INCLUDE_DIRS})
+add_definitions("-D${wxWidgets_DEFINITIONS}" ${wxWidgets_CXX_FLAGS})
+link_directories (${wxWidgets_LIB_DIR})
IF(WIN32)
include_directories(${BOOST_INCLUDE_DIRS})
@@ -28,14 +31,6 @@
PKG_CHECK_MODULES (Ogre OGRE REQUIRED)
PKG_CHECK_MODULES (Ois OIS REQUIRED)
- # find wxwidgets
- SET(wxWidgets_USE_UNICODE ON)
- FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS base core html net adv propgrid
aui)
- include_directories(${wxWidgets_INCLUDE_DIRS})
- add_definitions("-D${wxWidgets_DEFINITIONS}" ${wxWidgets_CXX_FLAGS})
- link_directories (${wxWidgets_LIB_DIR})
- set(OS_LIBS "${OS_LIBS};${wxWidgets_LIBRARIES}")
-
set(OS_SOURCE "")
ENDIF(WIN32)
@@ -119,6 +114,6 @@
add_executable(RoRViewer ${viewer_sources} ${viewer_headers} ${OS_SOURCE}
${additional_sources} ${HEADER_FILES} ${SOURCE_FILES} ../main/Settings.cpp
../main/errorutils.cpp)
-TARGET_LINK_LIBRARIES(RoRViewer ${WXWIDGETS_SHARED_LIBRARIES}
${Ogre_LIBRARIES} ${Ois_LIBRARIES} ${OS_LIBS} ${optional_libs})
+TARGET_LINK_LIBRARIES(RoRViewer ${wxWidgets_LIBRARIES} ${Ogre_LIBRARIES}
${Ois_LIBRARIES} ${OS_LIBS} ${optional_libs})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
