[Offscreengecko-commits] SF.net SVN: offscreengecko:[100] trunk/src
Status: Pre-Alpha
Brought to you by:
res2002
|
From: <re...@us...> - 2008-11-10 23:44:21
|
Revision: 100
http://offscreengecko.svn.sourceforge.net/offscreengecko/?rev=100&view=rev
Author: res2002
Date: 2008-11-10 23:44:15 +0000 (Mon, 10 Nov 2008)
Log Message:
-----------
Fix building on Win32
Modified Paths:
--------------
trunk/src/demos/CMakeLists.txt
trunk/src/libosgk/CMakeLists.txt
Modified: trunk/src/demos/CMakeLists.txt
===================================================================
--- trunk/src/demos/CMakeLists.txt 2008-11-02 23:03:48 UTC (rev 99)
+++ trunk/src/demos/CMakeLists.txt 2008-11-10 23:44:15 UTC (rev 100)
@@ -1,6 +1,8 @@
include_directories(../../include)
add_executable(webpage2image webpage2image.cpp)
-target_link_libraries(webpage2image "-Wl,--warn-unresolved-symbols -Wl,--as-needed")
+IF(CMAKE_COMPILER_IS_GNUCXX)
+ target_link_libraries(webpage2image "-Wl,--warn-unresolved-symbols -Wl,--as-needed")
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
target_link_libraries(webpage2image OffscreenGecko)
target_link_libraries(webpage2image osgk-common)
Modified: trunk/src/libosgk/CMakeLists.txt
===================================================================
--- trunk/src/libosgk/CMakeLists.txt 2008-11-02 23:03:48 UTC (rev 99)
+++ trunk/src/libosgk/CMakeLists.txt 2008-11-10 23:44:15 UTC (rev 100)
@@ -1,7 +1,7 @@
INCLUDE(FindPkgConfig)
include_directories(${OffscreenGecko_SOURCE_DIR}/include)
-set(XULRUNNER_SDK_DIR_DEFAULT "../xulrunner-sdk")
+set(XULRUNNER_SDK_DIR_DEFAULT "../../xulrunner-sdk")
IF(CMAKE_GENERATOR MATCHES "Visual Studio")
IF(NOT XULRUNNER_SDK_DIR)
@@ -89,9 +89,13 @@
ELSE(XULRUNNER_FLAT_INCDIR)
FOREACH(d ${XULRUNNER_INCLUDE_DIRS})
include_directories(${d}/content)
+ include_directories(${d}/docshell)
include_directories(${d}/dom)
include_directories(${d}/gfx)
include_directories(${d}/js)
+ include_directories(${d}/layout)
+ include_directories(${d}/locale)
+ include_directories(${d}/necko)
include_directories(${d}/nspr)
include_directories(${d}/pref)
include_directories(${d}/string)
@@ -119,6 +123,7 @@
link_libraries(${GTK_LDFLAGS})
ENDIF(XULRUNNER_WIDGET_GTK2)
+link_directories(${XULRUNNER_LIBRARY_DIRS})
file(GLOB sources *.cpp *.h)
add_library(OffscreenGecko SHARED ${sources})
target_link_libraries(OffscreenGecko osgk-common)
@@ -133,7 +138,6 @@
add_definitions("-fno-rtti -ggdb -fvisibility-inlines-hidden -fvisibility=hidden")
target_link_libraries(OffscreenGecko "-Wl,--warn-unresolved-symbols -Wl,--as-needed")
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-link_directories(${XULRUNNER_LIBRARY_DIRS})
IF(NOT CMAKE_GENERATOR MATCHES "Visual Studio")
message("Creating relaytool files...")
execute_process(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|