X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInput%2FCMakeLists.txt;h=a0031c2cb13a585b376a395ec9d6db3a82f7b73a;hb=5c789706630caf82d9043e61ee5e42d5e00b671f;hp=1a2df52d269614a08bc4a125d5b011f5ca58f6fa;hpb=f8a8805e2dde01e0c0a962c283880fa60fa23f0f;p=flightgear.git

diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt
index 1a2df52d2..a0031c2cb 100644
--- a/src/Input/CMakeLists.txt
+++ b/src/Input/CMakeLists.txt
@@ -2,8 +2,12 @@ include(FlightGearComponent)
 
 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()
 
 
@@ -17,37 +21,45 @@ set(SOURCES
 	FGMouseInput.cxx
 	input.cxx	
 	)
-	
+
+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})
-	include_directories(${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})
+	list(APPEND SOURCES ${EVENT_INPUT_HEADERS})
+	include_directories(${UDEV_INCLUDE_DIR})
+	add_definitions(-DWITH_EVENTINPUT)
 endif()
-	
+
 set(FGJS_SOURCES
 	fgjs.cxx
 	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 
-    ${SOCKETS_LIBRARY}
-	${SIMGEAR_LIBRARIES}
+	${SIMGEAR_CORE_LIBRARIES}
 	${PLIB_LIBRARIES}
-	${ZLIB_LIBRARY})
+	${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
 
 add_executable(js_demo js_demo.cxx)
 
 target_link_libraries(js_demo 
-	${SIMGEAR_LIBRARIES}
+	${SIMGEAR_CORE_LIBRARIES}
 	${PLIB_LIBRARIES}
-	${ZLIB_LIBRARY})
+	${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
 
-flightgear_component(Input "${SOURCES}")
+flightgear_component(Input "${SOURCES}" "${HEADERS}")
 
 install(TARGETS fgjs js_demo RUNTIME DESTINATION bin)