--- previous/src/CMakeLists.txt	2018/04/24 19:25:10	1.1
+++ previous/src/CMakeLists.txt	2018/04/24 19:27:33	1.1.1.3
@@ -1,12 +1,12 @@
 set(SOURCES
 	cart.c cfgopts.c
-	configuration.c options.c  change.c
-	control.c cycInt.c cycles.c dialog.c file.c
+	clocks_timings.c configuration.c options.c  change.c
+	control.c cycInt.c cycles.c dialog.c dma.c esp.c ethernet.c file.c
 	ioMem.c ioMemTabNEXT.c memorySnapShot.c keymap.c
-	m68000.c main.c
-	paths.c resolution.c reset.c
-	scandir.c nextMemory.c screen.c screenSnapShot.c shortcut.c
-	statusbar.c str.c zip.c unzip.c utils.c 
+	m68000.c main.c mo.c nextMemory.c
+	paths.c resolution.c reset.c scandir.c scc.c
+	screen.c screenSnapShot.c scsi.c shortcut.c
+	statusbar.c str.c sysReg.c zip.c unzip.c utils.c 
 	video.c )
 
 # When building for OSX, define specific sources for gui and ressources
@@ -21,12 +21,20 @@ endif(ENABLE_OSX_BUNDLE)
 
 
 # When building for Windows, define specific sources for gui and ressources
+# and set the subsytem of the resulting .exe to "windows GUI" instead of "console"
 if(WIN32)
 	set(GUIWIN_SOURCES gui-win/opencon.c)
 	set(GUIWIN_RES gui-win/hatari-winicon.rc)
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mwindows")
 endif(WIN32)
 
-include_directories(${CMAKE_BINARY_DIR} includes debug falcon uae-cpu
+if(ENABLE_WINUAE_CPU)
+	set(CPUDIR cpu)
+else()
+	set(CPUDIR uae-cpu)
+endif(ENABLE_WINUAE_CPU)
+
+include_directories(${CMAKE_BINARY_DIR} includes debug ${CPUDIR}
 		    ${SDL_INCLUDE_DIR})
 
 if(ZLIB_FOUND)
@@ -42,11 +50,11 @@ if(X11_FOUND)
 endif(X11_FOUND)
 
 
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/debug ${CMAKE_CURRENT_BINARY_DIR}/gui-sdl ${CMAKE_CURRENT_BINARY_DIR}/uae-cpu) 
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/debug ${CMAKE_CURRENT_BINARY_DIR}/gui-sdl ${CMAKE_CURRENT_BINARY_DIR}/${CPUDIR}) 
 
 add_subdirectory(debug)
 add_subdirectory(gui-sdl)
-add_subdirectory(uae-cpu)
+add_subdirectory(${CPUDIR})
 
 # When building for OSX, add specific sources
 if(ENABLE_OSX_BUNDLE)
@@ -106,7 +114,7 @@ if(PNG_FOUND)
 endif(PNG_FOUND)
 
 if(X11_FOUND)
-	target_link_libraries(previous ${X11_X11_LIB})
+	target_link_libraries(previous ${X11_LIBRARIES})
 endif(X11_FOUND)
 
 if(PORTAUDIO_FOUND)
@@ -115,7 +123,7 @@ endif(PORTAUDIO_FOUND)
 
 if(WIN32)
 	# Needed for socket() on Windows
-	target_link_libraries(hatari ws2_32)
+	target_link_libraries(previous ws2_32)
 endif(WIN32)
 
 if(ENABLE_OSX_BUNDLE)