Prepare and implement reinit methods for instruments

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

diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt
index 1f8458fa2734e9d94f143ff42de41813afd2abe8..a0031c2cb13a585b376a395ec9d6db3a82f7b73a 100644 (file)
--- a/src/Input/CMakeLists.txt
+++ b/src/Input/CMakeLists.txt
@@ -1,18 +1,15 @@
 include(FlightGearComponent)
 
-set(EVENT_INPUT_SOURCES
-       FGLinuxEventInput.cxx
-       FGMacOSXEventInput.cxx
-       )
+IF(APPLE)
+       set(EVENT_INPUT_SOURCES FGMacOSXEventInput.cxx)
+       set(EVENT_INPUT_HEADERS FGMacOSXEventInput.hxx)
+elseif(MSVC)
+       message(STATUS "EventInput not implemented for Windows yet")
+else()
+       set(EVENT_INPUT_SOURCES FGLinuxEventInput.cxx)
+       set(EVENT_INPUT_HEADERS FGLinuxEventInput.hxx)
+endif()
 
-set (JS_INPUT_SOURCES
-       js.cxx
-       jsBSD.cxx
-       jsLinux.cxx
-       jsMacOSX.cxx
-       jsWindows.cxx
-       jsNone.cxx
-       )
 
 set(SOURCES
        FGButton.cxx
@@ -22,16 +19,25 @@ set(SOURCES
        FGJoystickInput.cxx
        FGKeyboardInput.cxx
        FGMouseInput.cxx
-       input.cxx
+       input.cxx       
        )
 
-#
-# we still have a dependency on ul from plib!
+set(HEADERS
+       FGButton.hxx
+       FGCommonInput.hxx
+       FGDeviceConfigurationMap.hxx
+       FGEventInput.hxx
+       FGJoystickInput.hxx
+       FGKeyboardInput.hxx
+       FGMouseInput.hxx
+       input.hxx
+       )
 
 if(EVENT_INPUT)
        list(APPEND SOURCES ${EVENT_INPUT_SOURCES})
-else()
-       list(APPEND SOURCES ${JS_INPUT_SOURCES})
+       list(APPEND SOURCES ${EVENT_INPUT_HEADERS})
+       include_directories(${UDEV_INCLUDE_DIR})
+       add_definitions(-DWITH_EVENTINPUT)
 endif()
 
 set(FGJS_SOURCES
@@ -39,29 +45,21 @@ set(FGJS_SOURCES
        jsinput.cxx
        jssuper.cxx
        )
-       
-add_executable(fgjs ${FGJS_SOURCES})
 
-if(WIN32)
-   set(SOCKETS_LIBRARY wsock32.lib)
-endif(WIN32)
+add_executable(fgjs ${FGJS_SOURCES})
 
 target_link_libraries(fgjs 
-    fgInput
-    ${SOCKETS_LIBRARY}
-       ${SIMGEAR_LIBRARIES}
+       ${SIMGEAR_CORE_LIBRARIES}
        ${PLIB_LIBRARIES}
-       ${JS_LIBS}
-       ${ZLIB_LIBRARY})
+       ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
 
-add_executable(js_demo js_demo.cxx )
+add_executable(js_demo js_demo.cxx)
 
-target_link_libraries(js_demo
-       fgInput
-       ${JS_LIBS}
+target_link_libraries(js_demo 
+       ${SIMGEAR_CORE_LIBRARIES}
        ${PLIB_LIBRARIES}
-       )
+       ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
 
-flightgear_component(Input "${SOURCES}")
+flightgear_component(Input "${SOURCES}" "${HEADERS}")
 
 install(TARGETS fgjs js_demo RUNTIME DESTINATION bin)