--- previous/src/cpu/CMakeLists.txt	2018/04/24 19:25:47	1.1
+++ previous/src/cpu/CMakeLists.txt	2018/04/24 19:30:14	1.1.1.3
@@ -1,5 +1,5 @@
 
-include_directories(. ../.. ../includes ${SDL_INCLUDE_DIR}) 
+include_directories(. ../.. ../includes ${SDL2_INCLUDE_DIR}) 
 
 # Unfortunately we've got to specify the rules for the generated files twice,
 # once for cross compiling (with calling the host cc directly) and once
@@ -24,8 +24,8 @@ if(CMAKE_CROSSCOMPILING)
 		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gencpu.c
 			${CMAKE_CURRENT_SOURCE_DIR}/readcpu.c cpudefs.c)
 
-	add_custom_command(OUTPUT cpuemu_0.c cpuemu_11.c cpuemu_12.c
-				cpuemu_20.c cpuemu_21.c cpuemu_31.c cpustbl.c
+	add_custom_command(OUTPUT cpustbl.c 
+				cpuemu_31.c cpuemu_32.c
 		COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gencpu
 		DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gencpu)
 
@@ -33,17 +33,15 @@ else()	# Rules for normal build follow
 
 	add_executable(build68k build68k.c)
 
-	get_target_property(BUILD68K_EXE build68k LOCATION)
 	add_custom_command(OUTPUT cpudefs.c
-		COMMAND ${BUILD68K_EXE} < ${CMAKE_CURRENT_SOURCE_DIR}/table68k >cpudefs.c
+		COMMAND $<TARGET_FILE:build68k> < ${CMAKE_CURRENT_SOURCE_DIR}/table68k >cpudefs.c
 		DEPENDS table68k build68k)
 
 	add_executable(gencpu gencpu.c readcpu.c cpudefs.c)
 
-	get_target_property(GENCPU_EXE gencpu LOCATION)
-	add_custom_command(OUTPUT cpuemu_0.c cpuemu_11.c cpuemu_12.c
-				cpuemu_20.c cpuemu_21.c cpuemu_31.c cpustbl.c
-		COMMAND ${GENCPU_EXE}  DEPENDS gencpu)
+	add_custom_command(OUTPUT cpustbl.c 
+				cpuemu_31.c cpuemu_32.c
+		COMMAND $<TARGET_FILE:gencpu>  DEPENDS gencpu)
 
 endif(CMAKE_CROSSCOMPILING)
 
@@ -55,6 +53,8 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno
 endif(CMAKE_COMPILER_IS_GNUCC)
 
 add_library(UaeCpu
-	cpudefs.c cpuemu_0.c cpuemu_11.c cpuemu_12.c cpuemu_20.c cpuemu_21.c cpuemu_31.c 
-	cpummu.c cpustbl.c custom.c	hatari-glue.c memory.c newcpu.c readcpu.c fpp.c
+#cpuemu_0.c cpuemu_11.c cpuemu_12.c cpuemu_20.c cpuemu_21.c 
+	cpuemu_31.c cpuemu_32.c
+	cpudefs.c cpummu.c cpummu030.c cpustbl.c cpuemu_common.c custom.c
+    	hatari-glue.c memory.c newcpu.c readcpu.c fpp.c
 	)