FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved Browser.h and Browser.cpp from osgbrowser into osgWidget.

Browse Source
This commit is contained in:
Robert Osfield 2008-11-19 17:16:29 +00:00
parent aa28f1a3fd
commit 5288263528
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/osgbrowser/CMakeLists.txt
View File

@ -3,7 +3,6 @@ SET(TARGET_SRC
llembeddedbrowserwindow.cpp llembeddedbrowserwindow.cpp
llmozlib2.cpp llmozlib2.cpp
nsProfileDirServiceProvider.cpp nsProfileDirServiceProvider.cpp
Browser.cpp
UBrowser.cpp UBrowser.cpp
osgbrowser.cpp osgbrowser.cpp
ReaderWriterUBrowser.cpp ReaderWriterUBrowser.cpp
@ -16,11 +15,11 @@ SET(TARGET_H
nsProfileDirServiceProvider.h nsProfileDirServiceProvider.h
nsProfileLock.h nsProfileLock.h
nsProfileStringTypes.h nsProfileStringTypes.h
Browser.h
UBrowser.h UBrowser.h
) )
ADD_DEFINITIONS(-DMOZILLA_INTERNAL_API) ADD_DEFINITIONS(-DMOZILLA_INTERNAL_API)
ADD_DEFINITIONS(-DXUL_DIR=${XUL_DIR})
SET(ALL_REQUIRED_XUL_INCLUDE_DIRS SET(ALL_REQUIRED_XUL_INCLUDE_DIRS
${XUL_INCLUDE_DIRS} ${XUL_INCLUDE_DIRS}
@ -61,7 +60,7 @@ ELSE(WIN32 OR APPLE)
ENDIF(WIN32 OR APPLE) ENDIF(WIN32 OR APPLE)
ADD_DEFINITIONS(-DXUL_DIR=${XUL_DIR}) SET(TARGET_ADDED_LIBRARIES osgWidget )
#### end var setup ### #### end var setup ###
SETUP_EXAMPLE(osgbrowser) SETUP_EXAMPLE(osgbrowser)

2
examples/osgbrowser/UBrowser.h
View File

@ -14,7 +14,7 @@
#ifndef UBROWSER_H #ifndef UBROWSER_H
#define UBROWSER_H #define UBROWSER_H
#include "Browser.h" #include <osgWidget/Browser>
#include <osg/OperationThread> #include <osg/OperationThread>

1
examples/osgwidgetmenu/CMakeLists.txt
View File

@ -3,5 +3,6 @@
SET(TARGET_SRC osgwidgetmenu.cpp ) SET(TARGET_SRC osgwidgetmenu.cpp )
SET(TARGET_ADDED_LIBRARIES osgWidget ) SET(TARGET_ADDED_LIBRARIES osgWidget )
#### end var setup ### #### end var setup ###
SETUP_EXAMPLE(osgwidgetmenu) SETUP_EXAMPLE(osgwidgetmenu)

0
examples/osgbrowser/Browser.h → include/osgWidget/Browser
View File

2
examples/osgbrowser/Browser.cpp → src/osgWidget/Browser.cpp
View File

@ -11,7 +11,7 @@
* OpenSceneGraph Public License for more details. * OpenSceneGraph Public License for more details.
*/ */
#include "Browser.h" #include <osgWidget/Browser>
#include <osg/Notify> #include <osg/Notify>

2
src/osgWidget/CMakeLists.txt
View File

@ -9,6 +9,7 @@ SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Export ${HEADER_PATH}/Export
${HEADER_PATH}/Box ${HEADER_PATH}/Box
${HEADER_PATH}/Browser
${HEADER_PATH}/Canvas ${HEADER_PATH}/Canvas
${HEADER_PATH}/EventInterface ${HEADER_PATH}/EventInterface
${HEADER_PATH}/Frame ${HEADER_PATH}/Frame
@ -35,6 +36,7 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS} ${LIB_PUBLIC_HEADERS}
Box.cpp Box.cpp
Browser.cpp
Canvas.cpp Canvas.cpp
CMakeLists.txt CMakeLists.txt
Frame.cpp Frame.cpp