X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInput%2FCMakeLists.txt;h=e0d6abd30ca1065516d7ad69bec3f301bab9c545;hb=dc76290d6e7d2f24d6c352d8f9da4b0f9f1e5f40;hp=1f8458fa2734e9d94f143ff42de41813afd2abe8;hpb=4d0a6f5668ff2f8ca59a57a6ddd1c759c410900b;p=flightgear.git diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt index 1f8458fa2..e0d6abd30 100644 --- a/src/Input/CMakeLists.txt +++ b/src/Input/CMakeLists.txt @@ -5,15 +5,6 @@ set(EVENT_INPUT_SOURCES FGMacOSXEventInput.cxx ) -set (JS_INPUT_SOURCES - js.cxx - jsBSD.cxx - jsLinux.cxx - jsMacOSX.cxx - jsWindows.cxx - jsNone.cxx - ) - set(SOURCES FGButton.cxx FGCommonInput.cxx @@ -22,18 +13,13 @@ set(SOURCES FGJoystickInput.cxx FGKeyboardInput.cxx FGMouseInput.cxx - input.cxx + input.cxx ) - -# -# we still have a dependency on ul from plib! - + if(EVENT_INPUT) list(APPEND SOURCES ${EVENT_INPUT_SOURCES}) -else() - list(APPEND SOURCES ${JS_INPUT_SOURCES}) endif() - + set(FGJS_SOURCES fgjs.cxx jsinput.cxx @@ -47,20 +33,17 @@ if(WIN32) endif(WIN32) target_link_libraries(fgjs - fgInput ${SOCKETS_LIBRARY} ${SIMGEAR_LIBRARIES} ${PLIB_LIBRARIES} - ${JS_LIBS} ${ZLIB_LIBRARY}) -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_LIBRARIES} ${PLIB_LIBRARIES} - ) + ${ZLIB_LIBRARY}) flightgear_component(Input "${SOURCES}")