Index: Horde3D/Samples/Chicago/CMakeLists.txt
===================================================================
--- Horde3D/Samples/Chicago/CMakeLists.txt	(revision 280)
+++ Horde3D/Samples/Chicago/CMakeLists.txt	(working copy)
@@ -13,18 +13,20 @@
 	crowd.cpp
 	main.cpp
 	)
-
+	
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 target_link_libraries(Chicago Horde3D Horde3DUtils glfw)
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+FIND_LIBRARY(X11_LIBRARY X11)
+target_link_libraries(Chicago Horde3D Horde3DUtils glfw ${X11})
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		
 	   FIND_LIBRARY(COCOA_LIBRARY Cocoa)
        FIND_LIBRARY(APPLICATION_SERVICES_LIBRARY ApplicationServices)
        FIND_LIBRARY(AGL_LIBRARY AGL)
-       IF(COCOA_LIBRARY)   
-         target_link_libraries(Chicago ${COCOA_LIBRARY} ${APPLICATION_SERVICES_LIBRARY} ${AGL_LIBRARY})
-       ELSE(COCOA_LIBRARY)
-         FIND_LIBRARY(CARBON_LIBRARY Carbon)
-         target_link_libraries(Chicago ${CARBON_LIBRARY} ${APPLICATION_SERVICES_LIBRARY} ${AGL_LIBRARY})
-       ENDIF(COCOA_LIBRARY)
+       target_link_libraries(Chicago ${COCOA_LIBRARY} ${APPLICATION_SERVICES_LIBRARY} ${AGL_LIBRARY})
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
Index: Horde3D/Samples/glfw/CMakeLists.txt
===================================================================
--- Horde3D/Samples/glfw/CMakeLists.txt	(revision 281)
+++ Horde3D/Samples/glfw/CMakeLists.txt	(working copy)
@@ -33,6 +33,7 @@
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	include_directories(./lib ./lib/x11)
+	FIND_LIBRARY(X11_LIBRARY X11)
 	set(GLFW_SOURCES
 		${GLFW_SOURCES}
 		lib/x11/x11_enable.c
Index: Horde3D/Samples/Knight/CMakeLists.txt
===================================================================
--- Horde3D/Samples/Knight/CMakeLists.txt	(revision 280)
+++ Horde3D/Samples/Knight/CMakeLists.txt	(working copy)
@@ -12,8 +12,15 @@
 	main.cpp
 	)
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 target_link_libraries(Knight Horde3D Horde3DUtils glfw)
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+FIND_LIBRARY(X11_LIBRARY X11)
+target_link_libraries(Knight Horde3D Horde3DUtils glfw ${X11})
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		
 	   FIND_LIBRARY(COCOA_LIBRARY Cocoa)