CMakeLists.txt   CMakeLists.txt 
skipping to change at line 46 skipping to change at line 46
SET(gl_lib_SRCS core/external/GLee.h) SET(gl_lib_SRCS core/external/GLee.h)
ENDIF() ENDIF()
SET(stellarium_lib_SRCS SET(stellarium_lib_SRCS
core/StelAudioMgr.hpp core/StelAudioMgr.hpp
core/StelAudioMgr.cpp core/StelAudioMgr.cpp
core/StelGeodesicGrid.cpp core/StelGeodesicGrid.cpp
core/StelGeodesicGrid.hpp core/StelGeodesicGrid.hpp
core/StelMovementMgr.cpp core/StelMovementMgr.cpp
core/StelMovementMgr.hpp core/StelMovementMgr.hpp
core/StelNavigator.cpp
core/StelNavigator.hpp
core/StelObserver.cpp core/StelObserver.cpp
core/StelObserver.hpp core/StelObserver.hpp
core/StelLocation.hpp core/StelLocation.hpp
core/StelLocation.cpp core/StelLocation.cpp
core/StelLocationMgr.hpp core/StelLocationMgr.hpp
core/StelLocationMgr.cpp core/StelLocationMgr.cpp
core/StelProjector.cpp core/StelProjector.cpp
core/StelProjector.hpp core/StelProjector.hpp
core/StelProjectorClasses.cpp core/StelProjectorClasses.cpp
core/StelProjectorClasses.hpp core/StelProjectorClasses.hpp
skipping to change at line 342 skipping to change at line 340
################# compiles resources files ############ ################# compiles resources files ############
SET(stellarium_RES ${CMAKE_SOURCE_DIR}/data/mainRes.qrc) SET(stellarium_RES ${CMAKE_SOURCE_DIR}/data/mainRes.qrc)
QT4_ADD_RESOURCES(stellarium_RES_CXX ${stellarium_RES}) QT4_ADD_RESOURCES(stellarium_RES_CXX ${stellarium_RES})
################# compiles moc files ############ ################# compiles moc files ############
# Add here all the files which require moc compilation # Add here all the files which require moc compilation
# that is, all the headers with SIGNAL/SLOTS/PLUGIN_INTERFACE etc.. # that is, all the headers with SIGNAL/SLOTS/PLUGIN_INTERFACE etc..
SET(stellarium_MOC_HDRS SET(stellarium_MOC_HDRS
core/StelAudioMgr.hpp core/StelAudioMgr.hpp
core/StelModuleMgr.hpp core/StelModuleMgr.hpp
core/StelObjectMgr.hpp
core/StelObserver.hpp core/StelObserver.hpp
core/StelApp.hpp core/StelApp.hpp
core/StelNavigator.hpp
core/StelLocationMgr.hpp core/StelLocationMgr.hpp
core/StelCore.hpp core/StelCore.hpp
core/StelAppGraphicsWidget.hpp core/StelAppGraphicsWidget.hpp
core/StelTexture.hpp core/StelTexture.hpp
core/StelMovementMgr.hpp core/StelMovementMgr.hpp
core/MultiLevelJsonBase.hpp core/MultiLevelJsonBase.hpp
core/StelSkyImageTile.hpp core/StelSkyImageTile.hpp
core/StelSkyPolygon.hpp core/StelSkyPolygon.hpp
core/StelSkyDrawer.hpp core/StelSkyDrawer.hpp
core/StelSkyLayerMgr.hpp core/StelSkyLayerMgr.hpp
skipping to change at line 415 skipping to change at line 413
gui/DateTimeDialog.hpp gui/DateTimeDialog.hpp
gui/DateTimeDialog.cpp gui/DateTimeDialog.cpp
gui/ViewDialog.hpp gui/ViewDialog.hpp
gui/ViewDialog.cpp gui/ViewDialog.cpp
gui/SearchDialog.hpp gui/SearchDialog.hpp
gui/SearchDialog.cpp gui/SearchDialog.cpp
gui/ConfigurationDialog.hpp gui/ConfigurationDialog.hpp
gui/ConfigurationDialog.cpp gui/ConfigurationDialog.cpp
gui/AddRemoveLandscapesDialog.hpp gui/AddRemoveLandscapesDialog.hpp
gui/AddRemoveLandscapesDialog.cpp gui/AddRemoveLandscapesDialog.cpp
gui/AtmosphereDialog.hpp
gui/AtmosphereDialog.cpp
gui/StelDialog.hpp gui/StelDialog.hpp
gui/StelDialog.cpp) gui/StelDialog.cpp)
################# compiles GUI moc files ############ ################# compiles GUI moc files ############
SET(stellarium_gui_MOC_HDRS SET(stellarium_gui_MOC_HDRS
gui/StelGui.hpp gui/StelGui.hpp
gui/SkyGui.hpp gui/SkyGui.hpp
gui/StelGuiItems.hpp gui/StelGuiItems.hpp
gui/HelpDialog.hpp gui/HelpDialog.hpp
gui/Dialog.hpp gui/Dialog.hpp
gui/MapLabel.hpp gui/MapLabel.hpp
gui/AngleSpinBox.hpp gui/AngleSpinBox.hpp
gui/LocationDialog.hpp gui/LocationDialog.hpp
gui/DateTimeDialog.hpp gui/DateTimeDialog.hpp
gui/ViewDialog.hpp gui/ViewDialog.hpp
gui/SearchDialog.hpp gui/SearchDialog.hpp
gui/ConfigurationDialog.hpp gui/ConfigurationDialog.hpp
gui/AddRemoveLandscapesDialog.hpp gui/AddRemoveLandscapesDialog.hpp
gui/AtmosphereDialog.hpp
gui/StelDialog.hpp) gui/StelDialog.hpp)
################# compiles .ui files ############ ################# compiles .ui files ############
SET(stellarium_UIS SET(stellarium_UIS
gui/locationDialogGui.ui gui/locationDialogGui.ui
gui/helpDialogGui.ui gui/helpDialogGui.ui
gui/dateTimeDialogGui.ui gui/dateTimeDialogGui.ui
gui/viewDialog.ui gui/viewDialog.ui
gui/searchDialogGui.ui gui/searchDialogGui.ui
gui/configurationDialog.ui gui/configurationDialog.ui
gui/AtmosphereDialog.ui
gui/addRemoveLandscapesDialog.ui) gui/addRemoveLandscapesDialog.ui)
IF(ENABLE_SCRIPT_CONSOLE) IF(ENABLE_SCRIPT_CONSOLE)
SET(stellarium_gui_SRCS ${stellarium_gui_SRCS} SET(stellarium_gui_SRCS ${stellarium_gui_SRCS}
gui/ScriptConsole.hpp gui/ScriptConsole.hpp
gui/ScriptConsole.cpp gui/ScriptConsole.cpp
gui/StelScriptSyntaxHighlighter.hpp gui/StelScriptSyntaxHighlighter.hpp
gui/StelScriptSyntaxHighlighter.cpp) gui/StelScriptSyntaxHighlighter.cpp)
SET(stellarium_gui_MOC_HDRS ${stellarium_gui_MOC_HDRS} SET(stellarium_gui_MOC_HDRS ${stellarium_gui_MOC_HDRS}
gui/ScriptConsole.hpp gui/ScriptConsole.hpp
skipping to change at line 565 skipping to change at line 567
IF (USE_PLUGIN_SOLARSYSTEMEDITOR) IF (USE_PLUGIN_SOLARSYSTEMEDITOR)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/SolarSystemEditor/src/${CMAKE_CFG_I NTDIR}/libSolarSystemEditor.a") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/SolarSystemEditor/src/${CMAKE_CFG_I NTDIR}/libSolarSystemEditor.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_SOLARSYSTEMEDITOR) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_SOLARSYSTEMEDITOR)
ENDIF() ENDIF()
IF (USE_PLUGIN_TIMEZONECONFIGURATION) IF (USE_PLUGIN_TIMEZONECONFIGURATION)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/TimeZoneConfiguration/src/${CMAKE_C FG_INTDIR}/libTimeZoneConfiguration.a") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/TimeZoneConfiguration/src/${CMAKE_C FG_INTDIR}/libTimeZoneConfiguration.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_TIMEZONECONFIGURATION) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_TIMEZONECONFIGURATION)
ENDIF() ENDIF()
IF (USE_PLUGIN_SUPERNOVAS)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_
LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/Supernovas/src/${CMAKE_CFG_INTDIR}/
libSupernovas.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_SUPERNOVAS)
ENDIF()
IF (USE_PLUGIN_SVMT) IF (USE_PLUGIN_SVMT)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} ${CMAKE_BINARY_DIR}/plugins/svmt/src/${CMAKE_CFG_INTDIR}/libSVMT .a) SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} ${CMAKE_BINARY_DIR}/plugins/svmt/src/${CMAKE_CFG_INTDIR}/libSVMT .a)
IF(APPLE) IF(APPLE)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGIN S_LIBRARIES} "-framework QtDeclarative") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGIN S_LIBRARIES} "-framework QtDeclarative")
ELSE() ELSE()
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGIN S_LIBRARIES} ${QT_LIBRARY_DIR}/libQtDeclarative.so) SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGIN S_LIBRARIES} ${QT_LIBRARY_DIR}/libQtDeclarative.so)
ENDIF() ENDIF()
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_SVMT) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_SVMT)
ENDIF() ENDIF()
 End of changes. 7 change blocks. 
3 lines changed or deleted 12 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/