Crash-fix: mat-lib is now reference-counted.

[flightgear.git] / src / Main / CMakeLists.txt

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index bb996cad3eede7749d585a610a0a924dc97cd3d2..5512db22d651f0c54628252ada21f6f93f972efa 100644 (file)
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -1,10 +1,6 @@
 
 if (MSVC)
-       if (CMAKE_CL_64)
-               set( RESOURCE_FILE flightgear64.rc )
-       else (CMAKE_CL_64)
-               set( RESOURCE_FILE flightgear.rc )
-       endif (CMAKE_CL_64)
+       set( RESOURCE_FILE flightgear.rc )
 endif (MSVC)
 
 set(SOURCES
@@ -23,6 +19,7 @@ set(SOURCES
        util.cxx
     positioninit.cxx
     subsystemFactory.cxx
+    screensaver_control.cxx
        ${RESOURCE_FILE}
        )
 
@@ -40,6 +37,8 @@ set(HEADERS
        util.hxx
     positioninit.hxx
     subsystemFactory.hxx
+    AircraftDirVisitorBase.hxx
+    screensaver_control.hxx
        )
 
 get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES)
@@ -67,12 +66,11 @@ endforeach()
 
 source_group("Main\\Headers" FILES ${HEADERS})
 source_group("Main\\Sources" FILES ${SOURCES})
-add_executable(fgfs ${SOURCES} ${FG_SOURCES} ${FG_HEADERS} ${HEADERS})
 
-# disable sqlite3 dynamic lib support
-# this should really be a SOURCE property, but the way we handle
-# Fcomponent sources is making that tricky
-add_definitions(-DSQLITE_OMIT_LOAD_EXTENSION)
+# important we pass WIN32 here so the console is optional. Other
+# platforms ignore this option. If a console is needed we allocate
+# it manually via AllocConsole()
+add_executable(fgfs WIN32 ${SOURCES} ${FG_SOURCES} ${FG_HEADERS} ${HEADERS})
 
 get_property(FG_LIBS GLOBAL PROPERTY FG_LIBS)
 #message(STATUS "fg libs ${FG_LIBS}")
@@ -94,11 +92,18 @@ endif()
 if(ENABLE_IAX)
     target_link_libraries(fgfs iaxclient_lib ${OPENAL_LIBRARY})
 endif()
+if(USE_DBUS)
+    target_link_libraries(fgfs ${DBUS_LIBRARIES})
+endif()
 if(FG_HAVE_GPERFTOOLS)
     include_directories(${GooglePerfTools_INCLUDE_DIR})
     target_link_libraries(fgfs ${GooglePerfTools_LIBRARIES})
 endif()
 
+if (CRASHRPT_FOUND)
+       target_link_libraries(fgfs ${CRASHRPT_LIBRARY})
+endif()
+
 target_link_libraries(fgfs
        ${SQLITE3_LIBRARY}
        ${SIMGEAR_LIBRARIES}