diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000000000..b19c96122
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,374 @@
+cmake_minimum_required(VERSION 3.10)
+project(dosbox-x C CXX) # C for CheckIncludeFiles
+include(CheckTypeSize)
+include(CheckIncludeFiles)
+include(CheckFunctionExists) # for HAVE_MPROTECT, HAVE_SET_PRIORITY
+
+### options with safe-defaults (laid out like config.h.in)
+# Define if building universal (internal helper macro)
+# #undef AC_APPLE_UNIVERSAL_BUILD
+
+# Compiling on BSD
+# #undef BSD
+
+if(MSVC)
+	set(C_ATTRIBUTE_ALWAYS_INLINE 0)
+elseif(GNU)
+	set(C_ATTRIBUTE_ALWAYS_INLINE 1)
+else()
+	message(FATAL_ERROR "Option not implemented")
+endif()
+
+if(MSVC OR GNU)
+	set(C_ATTRIBUTE_FASTCALL 1)
+else()
+	message(FATAL_ERROR "Option not implemented")
+endif()
+
+option(C_AVCODEC "Define to 1 to use FFMPEG libavcodec for video capture" OFF)
+if(C_AVCODEC)
+	set(C_AVCODEC 1)
+endif()
+
+option(C_CORE_INLINE "Define to 1 to use inlined memory functions in cpu core" ON)
+if(C_CORE_INLINE)
+	set(C_CORE_INLINE 1)
+endif()
+
+option(C_DEBUG "Define to 1 to enable internal debugger, requires libcurses" OFF)
+if(C_DEBUG)
+	set(C_DEBUG 1)
+endif()
+
+option(C_DIRECTLPT "Define to 1 if you want parallel passthrough support (Win32, Linux)" OFF)
+if(C_DIRECTLPT)
+	set(C_DIRECTLPT 1)
+endif()
+
+option(C_DIRECTSERIAL "Define to 1 if you want serial passthrough support (Win32, Posix and OS/2)" OFF)
+if(C_DIRECTSERIAL)
+	set(C_DIRECTSERIAL 1)
+endif()
+
+option(C_DYNAMIC_X86 "Define to 1 to use x86 dynamic cpu core" ON)
+if(C_DYNAMIC_X86)
+	set(C_DYNAMIC_X86 1)
+endif()
+
+option(C_FLUIDSYNTH "Define to 1 to enable fluidsynth MIDI synthesis" OFF)
+if(C_FLUIDSYNTH)
+	set(C_FLUIDSYNTH 1)
+endif()
+
+option(C_FPU "Define to 1 to enable floating point emulation" ON)
+if(C_FPU)
+	set(C_FPU 1)
+endif()
+
+if(MSVC)
+	set(HAVE__ATTRIBUTE__ 0)
+elseif(GNU)
+	set(HAVE__ATTRIBUTE__ 1)
+else()
+	message(FATAL_ERROR "Option not implemented")
+endif()
+
+if(MSVC)
+	set(C_HAS_BUILTIN_EXPECT 0)
+elseif(GNU)
+	set(C_HAS_BUILTIN_EXPECT 1)
+else()
+	message(FATAL_ERROR "Option not implemented")
+endif()
+
+check_function_exists(mprotect HAVE_MPROTECT)
+if(HAVE_MPROTECT)
+  set(HAVE_MPROTECT 1)
+endif()
+
+option(C_HEAVY_DEBUG "Define to 1 to enable heavy debugging, also have to enable C_DEBUG" OFF)
+if(C_HEAVY_DEBUG)
+	set(C_HEAVY_DEBUG 1)
+endif()
+
+option(C_IPX "Define to 1 to enable IPX over Internet networking, requires SDL_net" OFF)
+if(C_IPX)
+	set(C_IPX 1)
+endif()
+
+option(C_LIBPNG "Define to 1 if you have libpng" ON)
+if(C_LIBPNG)
+	set(C_LIBPNG 1)
+endif()
+
+option(C_MODEM "Define to 1 to enable internal modem support, requires SDL_net" OFF)
+if(C_MODEM)
+	set(C_MODEM 1)
+endif()
+
+option(C_MT32 "Define to 1 to enable MT32 emulation (x86/x86_64 only)" OFF)
+if(C_MT32)
+	set(C_MT32 1)
+endif()
+
+option(C_NE2000 "Define to 1 to enable NE2000 ethernet passthrough, requires libpcap" OFF)
+if(C_NE2000)
+	set(C_NE2000 1)
+endif()
+
+option(C_OPENGL "Define to 1 to use opengl display output support" OFF)
+if(C_OPENGL)
+	set(C_OPENGL 1)
+endif()
+
+option(C_SDL1 "Set to 1 to enable SDL 1.x support" OFF)
+if(C_SDL1)
+	set(C_SDL1 1)
+endif()
+
+option(C_SDL2 "Set to 1 to enable SDL 2.x support" ON)
+if(C_SDL2)
+	set(C_SDL2 1)
+endif()
+
+# TODO C_SDL_NET
+
+check_function_exists(setpriority HAVE_SET_PRIORITY)
+if(HAVE_SET_PRIORITY)
+  set(C_SET_PRIORITY 1)
+endif()
+
+option(C_SSHOT "Define to 1 to enable screenshots, requires libpng" ON)
+if(C_SSHOT)
+	set(C_SSHOT 1)
+endif()
+
+option(C_UNALIGNED_MEMORY "Define to 1 to use a unaligned memory access" ON)
+if(C_UNALIGNED_MEMORY)
+	set(C_UNALIGNED_MEMORY 1)
+endif()
+
+set(VERSION "0.82.1" CACHE STRING "Version number of package")
+set(PACKAGE_STRING "dosbox-x 0.821" CACHE STRING "Define to the full name and version of this package")
+# set(PACKAGE "dosbox-x" CACHE STRING "Name of package")
+# set(PACKAGE_BUGREPORT "https://github.com/joncampbell123/dosbox-x/issues" CACHE STRING "Define to the address where bug reports for this package should be sent")
+# set(PACKAGE_NAME "dosbox-x" CACHE STRING "Define to the full name of this package")
+# set(PACKAGE_TARNAME "dosbox-x" CACHE STRING "Define to the one symbol short name of this package")
+# set(PACKAGE_URL "http://dosbox-x.software" CACHE STRING "Define to the home page for this package")
+# set(PACKAGE_VERSION "0.821" CACHE STRING "Define to the version of this package")
+# set(_FILE_OFFSET_BITS "64" CACHE STRING "Number of bits in a file offset, on hosts where this is settable")
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON) # solution filters in VS
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/include/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/aviwriter/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/builtin/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/cpu/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/cpu/core_dyn_x86/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/cpu/core_dynrec/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/cpu/core_full/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/cpu/core_normal/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/debug/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/dos/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/fpu/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/gui/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/hardware/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/hardware/parport/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/hardware/reSID/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/hardware/serialport/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/hardware/snd_pc98/cbus/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/hardware/snd_pc98/common/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/hardware/snd_pc98/generic/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/hardware/snd_pc98/sound/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/hardware/snd_pc98/sound/getsnd/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/hardware/snd_pc98/x11/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/ints/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/libs/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/libs/gui_tk/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/libs/porttalk/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/libs/zmbv/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/misc/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/mt32/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/mt32/freeverb/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/mt32/sha1/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/platform/CMakeLists.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/src/shell/CMakeLists.txt)
+
+set(ROOT
+	# suppresses default VS filters, desired but why official way fails ?
+	"${CMAKE_BINARY_DIR}/config.h"
+)
+source_group("\\" FILES ${ROOT})
+
+add_executable(dosbox-x
+	${ROOT}
+	${INCLUDES}
+	${SRC}
+	${SRC_AVIWRITER}
+	${SRC_BUILTIN}
+	${SRC_CPU}
+	${SRC_CPU_CORE_DYN_X86}
+	${SRC_CPU_CORE_DYN_REC}
+	${SRC_CPU_CORE_FULL}
+	${SRC_CPU_CORE_NORMAL}
+	${SRC_DEBUG}
+	${SRC_DOS}
+	${SRC_FPU}
+	${SRC_GUI}
+	${SRC_HARDWARE}
+	${SRC_HARDWARE_PARPORT}
+	${SRC_HARDWARE_RESID}
+	${SRC_HARDWARE_SERIALPORT}
+	${SRC_HARDWARE_SND_PC98}
+	${SRC_HARDWARE_SND_PC98_CBUS}
+	${SRC_HARDWARE_SND_PC98_COMMON}
+	${SRC_HARDWARE_SND_PC98_GENERIC}
+	${SRC_HARDWARE_SND_PC98_SOUND}
+	${SRC_HARDWARE_SND_PC98_SOUND_GETSND}
+	${SRC_HARDWARE_SND_PC98_X11}
+	${SRC_INTS}
+	${SRC_LIBS}
+	${SRC_LIBS_GUI_TK}
+	${SRC_LIBS_PORTTALK}
+	${SRC_LIBS_ZMBV}
+	${SRC_MISC}
+	${SRC_MT32}
+	${SRC_MT32_FREEVERB}
+	${SRC_MT32_SHA1}
+	${SRC_PLATFORM}
+	${SRC_SHELL}
+)
+
+CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H)
+CHECK_INCLUDE_FILES(memory.h HAVE_MEMORY_H)
+CHECK_INCLUDE_FILES(netinet/in.h HAVE_NETINET_IN_H)
+CHECK_INCLUDE_FILES(pwd.h HAVE_PWD_H)
+CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
+CHECK_INCLUDE_FILES(stdlib.h HAVE_STDLIB_H)
+CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H)
+CHECK_INCLUDE_FILES(string.h HAVE_STRING_H)
+CHECK_INCLUDE_FILES(sys/socket.h HAVE_SYS_SOCKET_H)
+CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H)
+CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
+CHECK_TYPE_SIZE("unsigned char" SIZEOF_UNSIGNED_CHAR)
+CHECK_TYPE_SIZE("unsigned short" SIZEOF_UNSIGNED_SHORT)
+CHECK_TYPE_SIZE("unsigned int" SIZEOF_UNSIGNED_INT)
+CHECK_TYPE_SIZE("unsigned long" SIZEOF_UNSIGNED_LONG)
+CHECK_TYPE_SIZE("unsigned long long" SIZEOF_UNSIGNED_LONG_LONG)
+CHECK_TYPE_SIZE("int *" SIZEOF_INT_P)
+
+configure_file(
+	${CMAKE_CURRENT_SOURCE_DIR}/config.cmake.h
+	${CMAKE_CURRENT_BINARY_DIR}/config.h
+)
+
+include_directories("include")
+include_directories(${CMAKE_BINARY_DIR}) # unistd.h, config.h
+include_directories(".") # TODO fix dumb bios.cpp include syntax
+include_directories("src/aviwriter")
+include_directories("src") # TODO lazyflags in fpu_instructions.h
+include_directories("src/hardware/snd_pc98/cbus")
+include_directories("src/hardware/snd_pc98/common")
+include_directories("src/hardware/snd_pc98/generic")
+include_directories("src/hardware/snd_pc98/sound")
+include_directories("src/hardware/snd_pc98/sound/getsnd")
+include_directories("src/hardware/snd_pc98/x11")
+include_directories("${ZLIB_INCLUDE_DIR}/SDL2") # nasty hack (vcpkg-specific)
+
+if (NOT MSVC)
+	# x86 intrinsic include in src/mt32/mmath.h fails on bare i686 target
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
+endif ()
+
+if (WIN32 AND (NOT MSVC))
+	# Always build static binaries on MinGW
+	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+	SET(CMAKE_EXE_LINKER_FLAGS "-static")
+endif ()
+
+if (MSVC)
+	# create fake unistd.h
+	file(WRITE "${CMAKE_BINARY_DIR}/unistd.h" "") 
+endif ()
+
+if (WIN32)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+	add_definitions(-D__WIN32__)
+	add_definitions(-D CMAKE_BUILD) # shim for _nhandle
+else ()
+	set(SRC_LIBS_ZMBV "")
+endif ()
+
+if(C_SDL1)
+	if (MSVC)
+		find_path(SDL_INCLUDE_DIR .)
+		find_path(LIBPNG_INCLUDE_DIR .)
+		find_path(ZLIB_INCLUDE_DIR .)
+
+		include_directories("${SDL_INCLUDE_DIR}")
+		include_directories("${LIBPNG_INCLUDE_DIR}")
+		include_directories("${ZLIB_INCLUDE_DIR}")
+
+		find_library(SDL_LIBRARY sdl.lib)
+		find_library(SDLMAIN_LIBRARY sdlmain.lib)
+		find_library(LIBPNG_LIBRARY libpng16.lib)
+		find_library(ZLIB_LIBRARY zlib.lib)
+	else ()
+		find_package(SDL REQUIRED)
+		include_directories(${SDL_INCLUDE_DIR})
+		find_package(PNG REQUIRED)
+		include_directories(${PNG_INCLUDE_DIR})
+		find_package(ZLIB REQUIRED)
+		include_directories(${ZLIB_INCLUDE_DIR})
+		find_package(OpenGL REQUIRED)
+	endif ()
+
+	if (WIN32)
+		set(EXTRA_LIBS
+				winmm
+				imm32)
+	endif ()
+
+	if (MSVC)
+		set(EXTRA_LIBS ${EXTRA_LIBS}
+				opengl32.lib
+				${SDL_LIBRARY}
+				${SDLMAIN_LIBRARY}
+				${LIBPNG_LIBRARY}
+				${ZLIB_LIBRARY})
+	else ()
+		set(EXTRA_LIBS
+				${SDL_LIBRARY}
+				${OPENGL_LIBRARIES}
+				${PNG_LIBRARIES}
+				${ZLIB_LIBRARIES}
+				${EXTRA_LIBS})
+		if (WIN32)
+			set(EXTRA_LIBS ${EXTRA_LIBS} dxguid)
+		endif ()
+	endif ()
+elseif(C_SDL2)
+	find_package(sdl2 REQUIRED)
+	find_package(PNG REQUIRED)
+	set(EXTRA_LIBS PNG::PNG)
+	set(EXTRA_LIBS ${EXTRA_LIBS} SDL2::SDL2 SDL2::SDL2main)
+else()
+	message(FATAL_ERROR "No SDL version selected !")
+endif()
+
+if (C_SDL1 AND C_SDL2)
+	message(FATAL_ERROR "Either SDL1 or SDL2 must be selected, not both !")
+endif()
+
+target_link_libraries(dosbox-x PRIVATE ${EXTRA_LIBS})
+
+set_target_properties(dosbox-x PROPERTIES LINKER_LANGUAGE CXX)
+
+# DEBUG print what's going on inside CMake
+# get_cmake_property(_variableNames VARIABLES)
+# list (SORT _variableNames)
+# foreach (_variableName ${_variableNames})
+	# message(STATUS "${_variableName}=${${_variableName}}")
+# endforeach()
diff --git a/config.cmake.h b/config.cmake.h
new file mode 100644
index 000000000..61e24160f
--- /dev/null
+++ b/config.cmake.h
@@ -0,0 +1,335 @@
+/* modified for CMake build */
+
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+
+/*
+ *  Copyright (C) 2002-2013  The DOSBox Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+
+/* Define if building universal (internal helper macro) */
+#cmakedefine AC_APPLE_UNIVERSAL_BUILD @AC_APPLE_UNIVERSAL_BUILD@
+
+/* Compiling on BSD */
+#cmakedefine BSD @BSD@
+
+/* Determines if the compilers supports always_inline attribute. */
+#cmakedefine C_ATTRIBUTE_ALWAYS_INLINE @C_ATTRIBUTE_ALWAYS_INLINE@
+
+/* Determines if the compilers supports fastcall attribute. */
+#cmakedefine C_ATTRIBUTE_FASTCALL @C_ATTRIBUTE_FASTCALL@
+
+/* Define to 1 to use FFMPEG libavcodec for video capture */
+#cmakedefine C_AVCODEC @C_AVCODEC@
+
+/* Define to 1 to use inlined memory functions in cpu core */
+#cmakedefine C_CORE_INLINE @C_CORE_INLINE@
+
+/* Define to 1 to enable internal debugger, requires libcurses */
+#cmakedefine C_DEBUG @C_DEBUG@
+
+/* Define to 1 if you want parallel passthrough support (Win32, Linux). */
+#cmakedefine C_DIRECTLPT @C_DIRECTLPT@
+
+/* Define to 1 if you want serial passthrough support (Win32, Posix and OS/2). */
+#cmakedefine C_DIRECTSERIAL @C_DIRECTSERIAL@
+
+/* Define to 1 to use x86 dynamic cpu core */
+#cmakedefine C_DYNAMIC_X86 @C_DYNAMIC_X86@
+
+/* Define to 1 to enable fluidsynth MIDI synthesis */
+#cmakedefine C_FLUIDSYNTH @C_FLUIDSYNTH@
+
+/* Define to 1 to enable floating point emulation */
+#cmakedefine C_FPU @C_FPU@
+
+/* Determines if the compilers supports attributes for structures. */
+#cmakedefine HAVE___ATTRIBUTE__ @HAVE___ATTRIBUTE__@
+
+/* Determines if the compilers supports __builtin_expect for branch prediction. */
+#cmakedefine HAVE___BUILTIN_EXPECT
+
+/* Define to 1 if you have the mprotect function */
+#cmakedefine C_HAVE_MPROTECT @C_HAVE_MPROTECT@
+
+/* Define to 1 to enable heavy debugging, also have to enable C_DEBUG */
+#cmakedefine C_HEAVY_DEBUG @C_HEAVY_DEBUG@
+
+/* Define to 1 to enable IPX over Internet networking, requires SDL_net */
+#cmakedefine C_IPX @C_IPX@
+
+/* Define to 1 if you have libpng */
+#cmakedefine C_LIBPNG @C_LIBPNG@
+
+/* Define to 1 to enable internal modem support, requires SDL_net */
+#cmakedefine C_MODEM @C_MODEM@
+
+/* Define to 1 to enable MT32 emulation (x86/x86_64 only) */
+#cmakedefine C_MT32 @C_MT32@
+
+/* Define to 1 to enable NE2000 ethernet passthrough, requires libpcap */
+#cmakedefine C_NE2000 @C_NE2000@
+
+/* Define to 1 to use opengl display output support */
+#cmakedefine C_OPENGL @C_OPENGL@
+
+/* Set to 1 to enable SDL 1.x support */
+#cmakedefine C_SDL1 @C_SDL1@
+
+/* Set to 1 to enable SDL 2.x support */
+#cmakedefine C_SDL2 @C_SDL2@
+
+/* Indicate whether SDL_net is present */
+#cmakedefine C_SDL_NET @C_SDL_NET@
+
+/* Define to 1 if you have setpriority support */
+#cmakedefine C_SET_PRIORITY @C_SET_PRIORITY@
+
+/* Define to 1 to enable screenshots, requires libpng */
+#cmakedefine C_SSHOT @C_SSHOT@
+
+/* The type of cpu this target has */
+#undef C_TARGETCPU
+
+/* Define to 1 to use a unaligned memory access */
+#cmakedefine C_UNALIGNED_MEMORY @C_UNALIGNED_MEMORY@
+
+/* define to 1 if you have XKBlib.h and X11 lib */
+#undef C_X11_XKB
+
+/* libm doesn't include powf */
+#undef DB_HAVE_NO_POWF
+
+/* struct dirent has d_type */
+#undef DIRENT_HAS_D_TYPE
+
+/* environ can be included */
+#undef ENVIRON_INCLUDED
+
+/* environ can be linked */
+#undef ENVIRON_LINKED
+
+/* Define to 1 to use ALSA for MIDI */
+#undef HAVE_ALSA
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@
+
+/* Define to 1 if you have the `asound' library (-lasound). */
+#undef HAVE_LIBASOUND
+
+/* Define to 1 if you have the <memory.h> header file. */
+#cmakedefine HAVE_MEMORY_H @HAVE_INTTYPES_H@
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#cmakedefine HAVE_NETINET_IN_H @HAVE_NETINET_IN_H@
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#cmakedefine HAVE_PWD_H @HAVE_PWD_H@
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#cmakedefine HAVE_STDINT_H @HAVE_STDINT_H@
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@
+
+/* Define to 1 if you have the <strings.h> header file. */
+#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@
+
+/* Define to 1 if you have the <string.h> header file. */
+#cmakedefine HAVE_STRING_H @HAVE_STRING_H@
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#cmakedefine HAVE_SYS_SOCKET_H @HAVE_SYS_SOCKET_H@
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@
+
+/* Compiling on GNU/Linux */
+#undef LINUX
+
+/* Compiling on Mac OS X */
+#undef MACOSX
+
+/* Compiling on OS/2 EMX */
+#undef OS2
+
+/* Name of package */
+#define PACKAGE "dosbox-x"
+
+/* Define to the address where bug reports for this package should be sent. */
+#cmakedefine PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
+
+/* Define to the full name of this package. */
+#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"
+
+/* Define to the full name and version of this package. */
+#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"
+
+/* Define to the one symbol short name of this package. */
+#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@"
+
+/* Define to the home page for this package. */
+#cmakedefine PACKAGE_URL "@PACKAGE_URL@"
+
+/* Define to the version of this package. */
+#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
+
+/* The size of `unsigned char', as computed by sizeof. */
+#cmakedefine SIZEOF_UNSIGNED_CHAR @SIZEOF_UNSIGNED_CHAR@
+
+/* The size of `unsigned short', as computed by sizeof. */
+#cmakedefine SIZEOF_UNSIGNED_SHORT @SIZEOF_UNSIGNED_SHORT@
+
+/* The size of `unsigned int', as computed by sizeof. */
+#cmakedefine SIZEOF_UNSIGNED_INT @SIZEOF_UNSIGNED_INT@
+
+/* The size of `unsigned long', as computed by sizeof. */
+#cmakedefine SIZEOF_UNSIGNED_LONG @SIZEOF_UNSIGNED_LONG@
+
+/* The size of `unsigned long long', as computed by sizeof. */
+#cmakedefine SIZEOF_UNSIGNED_LONG_LONG @SIZEOF_UNSIGNED_LONG_LONG@
+
+/* The size of `int *', as computed by sizeof. */
+#cmakedefine SIZEOF_INT_P @SIZEOF_INT_P@
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
+
+/* Version number of package */
+#cmakedefine VERSION "@VERSION@"
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
+
+/* Define to `int` if you don't have socklen_t */
+#undef socklen_t
+
+#if C_ATTRIBUTE_ALWAYS_INLINE
+#define INLINE inline __attribute__((always_inline))
+#else
+#define INLINE inline
+#endif
+
+#if C_ATTRIBUTE_FASTCALL
+#define DB_FASTCALL __attribute__((fastcall))
+#else
+#define DB_FASTCALL
+#endif
+
+#if C_HAS_ATTRIBUTE
+#define GCC_ATTRIBUTE(x) __attribute__ ((x))
+#else
+#define GCC_ATTRIBUTE(x) /* attribute not supported */
+#endif
+
+#if C_HAS_BUILTIN_EXPECT
+#define GCC_UNLIKELY(x) __builtin_expect((x),0)
+#define GCC_LIKELY(x) __builtin_expect((x),1)
+#else
+#define GCC_UNLIKELY(x) (x)
+#define GCC_LIKELY(x) (x)
+#endif
+
+
+typedef         double     Real64;
+
+#if SIZEOF_UNSIGNED_CHAR != 1
+#  error "sizeof (unsigned char) != 1"
+#else
+  typedef unsigned char Bit8u;
+  typedef   signed char Bit8s;
+#endif
+
+#if SIZEOF_UNSIGNED_SHORT != 2
+#  error "sizeof (unsigned short) != 2"
+#else
+  typedef unsigned short Bit16u;
+  typedef   signed short Bit16s;
+#endif
+
+#if SIZEOF_UNSIGNED_INT == 4
+  typedef unsigned int Bit32u;
+  typedef   signed int Bit32s;
+#elif SIZEOF_UNSIGNED_LONG == 4
+  typedef unsigned long Bit32u;
+  typedef   signed long Bit32s;
+#else
+#  error "can't find sizeof(type) of 4 bytes!"
+#endif
+
+#if SIZEOF_UNSIGNED_LONG == 8
+  typedef unsigned long Bit64u;
+  typedef   signed long Bit64s;
+#elif SIZEOF_UNSIGNED_LONG_LONG == 8
+  typedef unsigned long long Bit64u;
+  typedef   signed long long Bit64s;
+#else
+#  error "can't find data type of 8 bytes"
+#endif
+
+#if SIZEOF_INT_P == 4
+  typedef Bit32u Bitu;
+  typedef Bit32s Bits;
+#else
+  typedef Bit64u Bitu;
+  typedef Bit64s Bits;
+#endif
+
+
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
new file mode 100644
index 000000000..90f0fc0fd
--- /dev/null
+++ b/include/CMakeLists.txt
@@ -0,0 +1,81 @@
+set(INCLUDES
+	"${CMAKE_CURRENT_LIST_DIR}/8255.h"
+	"${CMAKE_CURRENT_LIST_DIR}/bios.h"
+	"${CMAKE_CURRENT_LIST_DIR}/bios_disk.h"
+	"${CMAKE_CURRENT_LIST_DIR}/bitmapinfoheader.h"
+	"${CMAKE_CURRENT_LIST_DIR}/build_timestamp.h"
+	"${CMAKE_CURRENT_LIST_DIR}/builtin.h"
+	"${CMAKE_CURRENT_LIST_DIR}/byteorder.h"
+	"${CMAKE_CURRENT_LIST_DIR}/callback.h"
+	"${CMAKE_CURRENT_LIST_DIR}/clockdomain.h"
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/control.h"
+	"${CMAKE_CURRENT_LIST_DIR}/cp437_uni.h"
+	"${CMAKE_CURRENT_LIST_DIR}/cp932_uni.h"
+	"${CMAKE_CURRENT_LIST_DIR}/cpu.h"
+	"${CMAKE_CURRENT_LIST_DIR}/cross.h"
+	"${CMAKE_CURRENT_LIST_DIR}/crypt.h"
+	"${CMAKE_CURRENT_LIST_DIR}/debug.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dma.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dosbox.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_inc.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_system.h"
+	"${CMAKE_CURRENT_LIST_DIR}/fpu.h"
+	"${CMAKE_CURRENT_LIST_DIR}/hardware.h"
+	"${CMAKE_CURRENT_LIST_DIR}/ide.h"
+	"${CMAKE_CURRENT_LIST_DIR}/informational.h"
+	"${CMAKE_CURRENT_LIST_DIR}/inout.h"
+	"${CMAKE_CURRENT_LIST_DIR}/ioapi.h"
+	"${CMAKE_CURRENT_LIST_DIR}/iowin32.h"
+	"${CMAKE_CURRENT_LIST_DIR}/ipx.h"
+	"${CMAKE_CURRENT_LIST_DIR}/ipxserver.h"
+	"${CMAKE_CURRENT_LIST_DIR}/joystick.h"
+	"${CMAKE_CURRENT_LIST_DIR}/keyboard.h"
+	"${CMAKE_CURRENT_LIST_DIR}/keymap.h"
+	"${CMAKE_CURRENT_LIST_DIR}/logging.h"
+	"${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/mapper.h"
+	"${CMAKE_CURRENT_LIST_DIR}/mem.h"
+	"${CMAKE_CURRENT_LIST_DIR}/menu.h"
+	"${CMAKE_CURRENT_LIST_DIR}/menudef.h"
+	"${CMAKE_CURRENT_LIST_DIR}/mixer.h"
+	"${CMAKE_CURRENT_LIST_DIR}/mmx.h"
+	"${CMAKE_CURRENT_LIST_DIR}/modules.h"
+	"${CMAKE_CURRENT_LIST_DIR}/mouse.h"
+	"${CMAKE_CURRENT_LIST_DIR}/mztools.h"
+	"${CMAKE_CURRENT_LIST_DIR}/ne2000.h"
+	"${CMAKE_CURRENT_LIST_DIR}/np2glue.h"
+	"${CMAKE_CURRENT_LIST_DIR}/paging.h"
+	"${CMAKE_CURRENT_LIST_DIR}/parport.h"
+	"${CMAKE_CURRENT_LIST_DIR}/pc98_cg.h"
+	"${CMAKE_CURRENT_LIST_DIR}/pc98_dac.h"
+	"${CMAKE_CURRENT_LIST_DIR}/pc98_gdc.h"
+	"${CMAKE_CURRENT_LIST_DIR}/pc98_gdc_const.h"
+	"${CMAKE_CURRENT_LIST_DIR}/pci_bus.h"
+	"${CMAKE_CURRENT_LIST_DIR}/pic.h"
+	"${CMAKE_CURRENT_LIST_DIR}/programs.h"
+	"${CMAKE_CURRENT_LIST_DIR}/qcow2_disk.h"
+	"${CMAKE_CURRENT_LIST_DIR}/rawint.h"
+	"${CMAKE_CURRENT_LIST_DIR}/regionalloctracking.h"
+	"${CMAKE_CURRENT_LIST_DIR}/regs.h"
+	"${CMAKE_CURRENT_LIST_DIR}/render.h"
+	"${CMAKE_CURRENT_LIST_DIR}/resource.h"
+	"${CMAKE_CURRENT_LIST_DIR}/selftest.h"
+	"${CMAKE_CURRENT_LIST_DIR}/serialport.h"
+	"${CMAKE_CURRENT_LIST_DIR}/setup.h"
+	"${CMAKE_CURRENT_LIST_DIR}/shell.h"
+	"${CMAKE_CURRENT_LIST_DIR}/shiftjis.h"
+	"${CMAKE_CURRENT_LIST_DIR}/support.h"
+	"${CMAKE_CURRENT_LIST_DIR}/timer.h"
+	"${CMAKE_CURRENT_LIST_DIR}/uint64_const.h"
+	"${CMAKE_CURRENT_LIST_DIR}/unzip.h"
+	"${CMAKE_CURRENT_LIST_DIR}/util_pointer.h"
+	"${CMAKE_CURRENT_LIST_DIR}/util_units.h"
+	"${CMAKE_CURRENT_LIST_DIR}/vga.h"
+	"${CMAKE_CURRENT_LIST_DIR}/video.h"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo.h"
+	"${CMAKE_CURRENT_LIST_DIR}/waveformatex.h"
+	"${CMAKE_CURRENT_LIST_DIR}/wave_mmreg.h"
+	"${CMAKE_CURRENT_LIST_DIR}/zip.h"
+)
+source_group("Includes" FILES ${INCLUDES}/)
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 000000000..0e78c178e
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(SRC
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/dosbox.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dosbox.ico"
+	"${CMAKE_CURRENT_LIST_DIR}/dosbox.pkginfo"
+	"${CMAKE_CURRENT_LIST_DIR}/dosbox.plist"
+	"${CMAKE_CURRENT_LIST_DIR}/dosbox.png"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/resource.h"
+	"${CMAKE_CURRENT_LIST_DIR}/winres.h"
+	"${CMAKE_CURRENT_LIST_DIR}/winres.rc"
+)
+source_group("Sources" FILES ${SRC})
\ No newline at end of file
diff --git a/src/aviwriter/CMakeLists.txt b/src/aviwriter/CMakeLists.txt
new file mode 100644
index 000000000..2d8c0faf5
--- /dev/null
+++ b/src/aviwriter/CMakeLists.txt
@@ -0,0 +1,18 @@
+set(SRC_AVIWRITER
+	"${CMAKE_CURRENT_LIST_DIR}/avi.h"
+	"${CMAKE_CURRENT_LIST_DIR}/avi_rw_iobuf.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/avi_rw_iobuf.h"
+	"${CMAKE_CURRENT_LIST_DIR}/avi_writer.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/avi_writer.h"
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/guid.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/guid.h"
+	"${CMAKE_CURRENT_LIST_DIR}/ksdataformat.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/ksdataformat.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/riff.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/riff.h"
+	"${CMAKE_CURRENT_LIST_DIR}/riff_wav_writer.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/riff_wav_writer.h"
+)
+source_group("Sources\\aviwriter" FILES ${SRC_AVIWRITER})
diff --git a/src/builtin/CMakeLists.txt b/src/builtin/CMakeLists.txt
new file mode 100644
index 000000000..44eb581f6
--- /dev/null
+++ b/src/builtin/CMakeLists.txt
@@ -0,0 +1,27 @@
+set(SRC_BUILTIN
+	"${CMAKE_CURRENT_LIST_DIR}/25_com.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/28_com.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/50_com.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/append_exe.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/buffers_com.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/copy_exe.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/cwsdpmi_exe.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/debug_exe.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/device_com.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos32a_exe.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos4gw_exe.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dosidle_exe.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/edit_com.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/fcbs_com.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/find_exe.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/hexmem16_exe.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/hexmem32_exe.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/lastdriv_com.cpp"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/mem_com.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/move_exe.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/tree_exe.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/xcopy_exe.cpp"
+)
+source_group("Sources\\builtin" FILES ${SRC_BUILTIN})
diff --git a/src/cpu/CMakeLists.txt b/src/cpu/CMakeLists.txt
new file mode 100644
index 000000000..00627f709
--- /dev/null
+++ b/src/cpu/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(SRC_CPU
+	"${CMAKE_CURRENT_LIST_DIR}/callback.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/core_dyn_x86.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/core_full.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/core_normal.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/core_normal_286.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/core_normal_8086.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/core_prefetch.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/core_simple.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/cpu.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/flags.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/instructions.h"
+	"${CMAKE_CURRENT_LIST_DIR}/lazyflags.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/mmx.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/modrm.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/modrm.h"
+	"${CMAKE_CURRENT_LIST_DIR}/paging.cpp"
+)
+source_group("Sources\\cpu" FILES ${SRC_CPU})
diff --git a/src/cpu/core_dyn_x86/CMakeLists.txt b/src/cpu/core_dyn_x86/CMakeLists.txt
new file mode 100644
index 000000000..1786d60f2
--- /dev/null
+++ b/src/cpu/core_dyn_x86/CMakeLists.txt
@@ -0,0 +1,12 @@
+set(SRC_CPU_CORE_DYNX86
+	"${CMAKE_CURRENT_LIST_DIR}/cache.h"
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/decoder.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dyn_fpu.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dyn_fpu_dh.h"
+	"${CMAKE_CURRENT_LIST_DIR}/helpers.h"
+	"${CMAKE_CURRENT_LIST_DIR}/mmx_gen.h"
+	"${CMAKE_CURRENT_LIST_DIR}/risc_x86.h"
+	"${CMAKE_CURRENT_LIST_DIR}/string.h"
+)
+source_group("Sources\\cpu\\core_dyn_x86" FILES ${SRC_CPU_CORE_DYN_X86})
diff --git a/src/cpu/core_dynrec/CMakeLists.txt b/src/cpu/core_dynrec/CMakeLists.txt
new file mode 100644
index 000000000..129a61702
--- /dev/null
+++ b/src/cpu/core_dynrec/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(SRC_CPU_CORE_DYNREC
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile"
+	# This is so that the solution folders appears in VS, delete it once done
+	"${CMAKE_CURRENT_LIST_DIR}/placeholder.txt"
+)
+source_group("Sources\\cpu\\core_dyn_rec" FILES ${SRC_CPU_CORE_DYN_REC})
diff --git a/src/cpu/core_dynrec/placeholder.txt b/src/cpu/core_dynrec/placeholder.txt
new file mode 100644
index 000000000..2be0d1d65
--- /dev/null
+++ b/src/cpu/core_dynrec/placeholder.txt
@@ -0,0 +1 @@
+This is so that the solution folders appears in VS, delete it once done
\ No newline at end of file
diff --git a/src/cpu/core_full/CMakeLists.txt b/src/cpu/core_full/CMakeLists.txt
new file mode 100644
index 000000000..7005621a4
--- /dev/null
+++ b/src/cpu/core_full/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(SRC_CPU_CORE_FULL
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/ea_lookup.h"
+	"${CMAKE_CURRENT_LIST_DIR}/load.h"
+	"${CMAKE_CURRENT_LIST_DIR}/loadwrite.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/op.h"
+	"${CMAKE_CURRENT_LIST_DIR}/optable.h"
+	"${CMAKE_CURRENT_LIST_DIR}/save.h"
+	"${CMAKE_CURRENT_LIST_DIR}/string.h"
+	"${CMAKE_CURRENT_LIST_DIR}/support.h"
+)
+source_group("Sources\\cpu\\core_full" FILES ${SRC_CPU_CORE_FULL})
diff --git a/src/cpu/core_normal/CMakeLists.txt b/src/cpu/core_normal/CMakeLists.txt
new file mode 100644
index 000000000..ef06a1e1b
--- /dev/null
+++ b/src/cpu/core_normal/CMakeLists.txt
@@ -0,0 +1,15 @@
+set(SRC_CPU_CORE_NORMAL
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/helpers.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/prefix_0f.h"
+	"${CMAKE_CURRENT_LIST_DIR}/prefix_0f_mmx.h"
+	"${CMAKE_CURRENT_LIST_DIR}/prefix_66.h"
+	"${CMAKE_CURRENT_LIST_DIR}/prefix_66_0f.h"
+	"${CMAKE_CURRENT_LIST_DIR}/prefix_none.h"
+	"${CMAKE_CURRENT_LIST_DIR}/string.h"
+	"${CMAKE_CURRENT_LIST_DIR}/support.h"
+	"${CMAKE_CURRENT_LIST_DIR}/table_ea.h"
+	"${CMAKE_CURRENT_LIST_DIR}/table_ea_8086.h"
+)
+source_group("Sources\\cpu\\core_normal" FILES ${SRC_CPU_CORE_NORMAL})
diff --git a/src/dos/CMakeLists.txt b/src/dos/CMakeLists.txt
new file mode 100644
index 000000000..58777582d
--- /dev/null
+++ b/src/dos/CMakeLists.txt
@@ -0,0 +1,38 @@
+set(SRC_DOS
+	"${CMAKE_CURRENT_LIST_DIR}/cdrom.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/cdrom.h"
+	"${CMAKE_CURRENT_LIST_DIR}/cdrom_aspi_win32.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/cdrom_image.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/cdrom_ioctl_linux.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/cdrom_ioctl_os2.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/cdrom_ioctl_win32.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/dev_con.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dos.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_classes.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_codepages.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_devices.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_execute.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_files.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_ioctl.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_keyboard_layout.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_keyboard_layout_data.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_memory.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_misc.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_mscdex.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_network.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_network2.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_programs.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dos_tables.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/drives.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/drives.h"
+	"${CMAKE_CURRENT_LIST_DIR}/drive_cache.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/drive_fat.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/drive_iso.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/drive_local.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/drive_virtual.cpp"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/scsidefs.h"
+	"${CMAKE_CURRENT_LIST_DIR}/wnaspi32.h"
+)
+source_group("Sources\\dos" FILES ${SRC_DOS})
\ No newline at end of file
diff --git a/src/fpu/CMakeLists.txt b/src/fpu/CMakeLists.txt
new file mode 100644
index 000000000..9299f033d
--- /dev/null
+++ b/src/fpu/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(SRC_FPU
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/fpu.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/fpu_instructions.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+)
+source_group("Sources\\fpu" FILES ${SRC_FPU})
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
new file mode 100644
index 000000000..40a321175
--- /dev/null
+++ b/src/gui/CMakeLists.txt
@@ -0,0 +1,40 @@
+set(SRC_GUI
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/d3d_components.h"
+	"${CMAKE_CURRENT_LIST_DIR}/direct3d.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/direct3d.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dosbox.cga640.bmp.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dosbox.vga16.bmp.h"
+	"${CMAKE_CURRENT_LIST_DIR}/dosbox_logo.h"
+	"${CMAKE_CURRENT_LIST_DIR}/hq2x_d3d.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/hq2x_d3d.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/menu.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/menu_osx.mm"
+	"${CMAKE_CURRENT_LIST_DIR}/midi.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/midi_alsa.h"
+	"${CMAKE_CURRENT_LIST_DIR}/midi_coreaudio.h"
+	"${CMAKE_CURRENT_LIST_DIR}/midi_coremidi.h"
+	"${CMAKE_CURRENT_LIST_DIR}/midi_mt32.h"
+	"${CMAKE_CURRENT_LIST_DIR}/midi_oss.h"
+	"${CMAKE_CURRENT_LIST_DIR}/midi_synth.h"
+	"${CMAKE_CURRENT_LIST_DIR}/midi_timidity.h"
+	"${CMAKE_CURRENT_LIST_DIR}/midi_win32.h"
+	"${CMAKE_CURRENT_LIST_DIR}/render.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/render_loops.h"
+	"${CMAKE_CURRENT_LIST_DIR}/render_scalers.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/render_scalers.h"
+	"${CMAKE_CURRENT_LIST_DIR}/render_simple.h"
+	"${CMAKE_CURRENT_LIST_DIR}/render_templates.h"
+	"${CMAKE_CURRENT_LIST_DIR}/render_templates_hq.h"
+	"${CMAKE_CURRENT_LIST_DIR}/render_templates_hq2x.h"
+	"${CMAKE_CURRENT_LIST_DIR}/render_templates_hq3x.h"
+	"${CMAKE_CURRENT_LIST_DIR}/render_templates_sai.h"
+	"${CMAKE_CURRENT_LIST_DIR}/ScalingEffect.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/ScalingEffect.h"
+	"${CMAKE_CURRENT_LIST_DIR}/sdlmain.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/sdlmain_linux.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/sdl_gui.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/sdl_mapper.cpp"
+)
+source_group("Sources\\gui" FILES ${SRC_GUI})
diff --git a/src/hardware/CMakeLists.txt b/src/hardware/CMakeLists.txt
new file mode 100644
index 000000000..deecb0301
--- /dev/null
+++ b/src/hardware/CMakeLists.txt
@@ -0,0 +1,76 @@
+set(SRC_HARDWARE
+	"${CMAKE_CURRENT_LIST_DIR}/8255.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/adlib.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/adlib.h"
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/cmos.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dbopl.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dbopl.h"
+	"${CMAKE_CURRENT_LIST_DIR}/disney.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dma.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/dongle.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/floppy.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/gameblaster.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/gus.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/hardopl.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/hardware.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/ide.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/innova.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/iohandler.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/ipx.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/ipxserver.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/joystick.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/keyboard.cpp"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/memory.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/mixer.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/mpu401.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/ne2000.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/nukedopl.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/nukedopl.h"
+	"${CMAKE_CURRENT_LIST_DIR}/opl.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/opl.h"
+	"${CMAKE_CURRENT_LIST_DIR}/pc98.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/pc98_fm.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/pci_bus.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/pci_devices.h"
+	"${CMAKE_CURRENT_LIST_DIR}/pcspeaker.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/pic.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/ps1_sound.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/sblaster.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/sn76496.h"
+	"${CMAKE_CURRENT_LIST_DIR}/tandy_sound.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/timer.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_attr.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_crtc.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_dac.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_draw.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_gfx.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_memory.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_misc.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_other.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_paradise.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_pc98_cg.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_pc98_crtc.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_pc98_dac.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_pc98_egc.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_pc98_gdc.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_s3.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_seq.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_tseng.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/vga_xga.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo_data.h"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo_def.h"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo_emu.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo_emu.h"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo_interface.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo_interface.h"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo_opengl.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo_opengl.h"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo_types.h"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo_vogl.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/voodoo_vogl.h"
+)
+source_group("Sources\\hardware" FILES ${SRC_HARDWARE})
diff --git a/src/hardware/parport/CMakeLists.txt b/src/hardware/parport/CMakeLists.txt
new file mode 100644
index 000000000..f07194e1a
--- /dev/null
+++ b/src/hardware/parport/CMakeLists.txt
@@ -0,0 +1,18 @@
+set(SRC_HARDWARE_PARPORT
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/directlpt_linux.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/directlpt_linux.h"
+	"${CMAKE_CURRENT_LIST_DIR}/directlpt_win32.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/directlpt_win32.h"
+	"${CMAKE_CURRENT_LIST_DIR}/filelpt.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/filelpt.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/parport.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/printer.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/printer.h"
+	"${CMAKE_CURRENT_LIST_DIR}/printer_charmaps.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/printer_charmaps.h"
+	"${CMAKE_CURRENT_LIST_DIR}/printer_if.h"
+	"${CMAKE_CURRENT_LIST_DIR}/printer_redir.h"
+)
+source_group("Sources\\hardware\\parport" FILES ${SRC_HARDWARE_PARPORT})
diff --git a/src/hardware/reSID/CMakeLists.txt b/src/hardware/reSID/CMakeLists.txt
new file mode 100644
index 000000000..51a72b0bb
--- /dev/null
+++ b/src/hardware/reSID/CMakeLists.txt
@@ -0,0 +1,31 @@
+set(SRC_HARDWARE_RESID
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/envelope.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/envelope.h"
+	"${CMAKE_CURRENT_LIST_DIR}/extfilt.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/extfilt.h"
+	"${CMAKE_CURRENT_LIST_DIR}/filter.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/filter.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/pot.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/pot.h"
+	"${CMAKE_CURRENT_LIST_DIR}/q.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/sid.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/sid.h"
+	"${CMAKE_CURRENT_LIST_DIR}/siddefs.h"
+	"${CMAKE_CURRENT_LIST_DIR}/spline.h"
+	"${CMAKE_CURRENT_LIST_DIR}/version.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/voice.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/voice.h"
+	"${CMAKE_CURRENT_LIST_DIR}/wave.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/wave.h"
+	"${CMAKE_CURRENT_LIST_DIR}/wave6581_PST.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/wave6581_PS_.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/wave6581_P_T.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/wave6581__ST.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/wave8580_PST.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/wave8580_PS_.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/wave8580_P_T.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/wave8580__ST.cpp"
+)
+source_group("Sources\\hardware\\reSID" FILES ${SRC_HARDWARE_RESID})
diff --git a/src/hardware/serialport/CMakeLists.txt b/src/hardware/serialport/CMakeLists.txt
new file mode 100644
index 000000000..10eb075cd
--- /dev/null
+++ b/src/hardware/serialport/CMakeLists.txt
@@ -0,0 +1,22 @@
+set(SRC_HARDWARE_SERIALPORT
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/directserial.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/directserial.h"
+	"${CMAKE_CURRENT_LIST_DIR}/libserial.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/libserial.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/misc_util.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/misc_util.h"
+	"${CMAKE_CURRENT_LIST_DIR}/nullmodem.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/nullmodem.h"
+	"${CMAKE_CURRENT_LIST_DIR}/serialdummy.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/serialdummy.h"
+	"${CMAKE_CURRENT_LIST_DIR}/seriallog.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/seriallog.h"
+	"${CMAKE_CURRENT_LIST_DIR}/serialmouse.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/serialmouse.h"
+	"${CMAKE_CURRENT_LIST_DIR}/serialport.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/softmodem.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/softmodem.h"
+)
+source_group("Sources\\hardware\\serialport" FILES ${SRC_HARDWARE_SERIALPORT})
diff --git a/src/hardware/snd_pc98/cbus/CMakeLists.txt b/src/hardware/snd_pc98/cbus/CMakeLists.txt
new file mode 100644
index 000000000..133205942
--- /dev/null
+++ b/src/hardware/snd_pc98/cbus/CMakeLists.txt
@@ -0,0 +1,28 @@
+set(SRC_HARDWARE_SND_PC98_CBUS
+	# "${CMAKE_CURRENT_LIST_DIR}/amd98.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/amd98.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/board118.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/board118.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/board14.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/board14.h"
+	"${CMAKE_CURRENT_LIST_DIR}/board26k.c"
+	"${CMAKE_CURRENT_LIST_DIR}/board26k.h"
+	"${CMAKE_CURRENT_LIST_DIR}/board86.c"
+	"${CMAKE_CURRENT_LIST_DIR}/board86.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/boardpx.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/boardpx.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/boardspb.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/boardspb.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/boardx2.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/boardx2.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/cbuscore.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/cbuscore.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	# "${CMAKE_CURRENT_LIST_DIR}/cs4231io.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/cs4231io.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/pc9861k.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/pc9861k.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/pcm86io.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/pcm86io.h"
+)
+source_group("Sources\\hardware\\snd_pc98\\cbus" FILES ${SRC_HARDWARE_SND_PC98_CBUS})
diff --git a/src/hardware/snd_pc98/common/CMakeLists.txt b/src/hardware/snd_pc98/common/CMakeLists.txt
new file mode 100644
index 000000000..298ef96cd
--- /dev/null
+++ b/src/hardware/snd_pc98/common/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(SRC_HARDWARE_SND_PC98_COMMON
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/parts.c"
+	"${CMAKE_CURRENT_LIST_DIR}/parts.h"
+	"${CMAKE_CURRENT_LIST_DIR}/profile.h"
+	"${CMAKE_CURRENT_LIST_DIR}/wavefile.h"
+)
+source_group("Sources\\hardware\\snd_pc98\\common" FILES ${SRC_HARDWARE_SND_PC98_COMMON})
diff --git a/src/hardware/snd_pc98/generic/CMakeLists.txt b/src/hardware/snd_pc98/generic/CMakeLists.txt
new file mode 100644
index 000000000..9a7d21770
--- /dev/null
+++ b/src/hardware/snd_pc98/generic/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(SRC_HARDWARE_SND_PC98_GENERIC
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/keydisp.c"
+	"${CMAKE_CURRENT_LIST_DIR}/keydisp.h"
+)
+source_group("Sources\\hardware\\snd_pc98\\generic" FILES ${SRC_HARDWARE_SND_PC98_GENERIC})
diff --git a/src/hardware/snd_pc98/sound/CMakeLists.txt b/src/hardware/snd_pc98/sound/CMakeLists.txt
new file mode 100644
index 000000000..ca7223a7c
--- /dev/null
+++ b/src/hardware/snd_pc98/sound/CMakeLists.txt
@@ -0,0 +1,33 @@
+set(SRC_HARDWARE_SND_PC98_SOUND
+	"${CMAKE_CURRENT_LIST_DIR}/adpcm.h"
+	"${CMAKE_CURRENT_LIST_DIR}/adpcmc.c"
+	"${CMAKE_CURRENT_LIST_DIR}/adpcmg.c"
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/fmboard.c"
+	"${CMAKE_CURRENT_LIST_DIR}/fmboard.h"
+	"${CMAKE_CURRENT_LIST_DIR}/fmtimer.c"
+	"${CMAKE_CURRENT_LIST_DIR}/fmtimer.h"
+	"${CMAKE_CURRENT_LIST_DIR}/opngen.h"
+	"${CMAKE_CURRENT_LIST_DIR}/opngenc.c"
+	"${CMAKE_CURRENT_LIST_DIR}/opngeng.c"
+	"${CMAKE_CURRENT_LIST_DIR}/pcm86.h"
+	"${CMAKE_CURRENT_LIST_DIR}/pcm86c.c"
+	"${CMAKE_CURRENT_LIST_DIR}/pcm86g.c"
+	"${CMAKE_CURRENT_LIST_DIR}/psggen.h"
+	"${CMAKE_CURRENT_LIST_DIR}/psggenc.c"
+	"${CMAKE_CURRENT_LIST_DIR}/psggeng.c"
+	"${CMAKE_CURRENT_LIST_DIR}/rhythm.h"
+	"${CMAKE_CURRENT_LIST_DIR}/rhythmc.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/s98.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/s98.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/sndcsec.c"
+	# "${CMAKE_CURRENT_LIST_DIR}/sndcsec.h"
+	"${CMAKE_CURRENT_LIST_DIR}/sound.c"
+	"${CMAKE_CURRENT_LIST_DIR}/sound.h"
+	"${CMAKE_CURRENT_LIST_DIR}/soundrom.c"
+	"${CMAKE_CURRENT_LIST_DIR}/soundrom.h"
+	"${CMAKE_CURRENT_LIST_DIR}/tms3631.h"
+	"${CMAKE_CURRENT_LIST_DIR}/tms3631c.c"
+	"${CMAKE_CURRENT_LIST_DIR}/tms3631g.c"
+)
+source_group("Sources\\hardware\\snd_pc98\\sound" FILES ${SRC_HARDWARE_SND_PC98_SOUND})
diff --git a/src/hardware/snd_pc98/sound/getsnd/CMakeLists.txt b/src/hardware/snd_pc98/sound/getsnd/CMakeLists.txt
new file mode 100644
index 000000000..cb194e3f5
--- /dev/null
+++ b/src/hardware/snd_pc98/sound/getsnd/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(SRC_HARDWARE_SND_PC98_SOUND_GETSND
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/getsmix.c"
+	"${CMAKE_CURRENT_LIST_DIR}/getsnd.c"
+	"${CMAKE_CURRENT_LIST_DIR}/getsnd.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/getsndmn.mcr"
+	# "${CMAKE_CURRENT_LIST_DIR}/getsndst.mcr"
+	"${CMAKE_CURRENT_LIST_DIR}/getwave.c"
+)
+source_group("Sources\\hardware\\snd_pc98\\sound\\getsnd" FILES ${SRC_HARDWARE_SND_PC98_SOUND_GETSND})
diff --git a/src/hardware/snd_pc98/x11/CMakeLists.txt b/src/hardware/snd_pc98/x11/CMakeLists.txt
new file mode 100644
index 000000000..9e148eedd
--- /dev/null
+++ b/src/hardware/snd_pc98/x11/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(SRC_HARDWARE_SND_PC98_X11
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/dosio.c"
+	"${CMAKE_CURRENT_LIST_DIR}/dosio.h"
+)
+source_group("Sources\\hardware\\snd_pc98\\x11" FILES ${SRC_HARDWARE_SND_PC98_X11})
diff --git a/src/ints/CMakeLists.txt b/src/ints/CMakeLists.txt
new file mode 100644
index 000000000..4e323ab7d
--- /dev/null
+++ b/src/ints/CMakeLists.txt
@@ -0,0 +1,26 @@
+set(SRC_INTS
+	"${CMAKE_CURRENT_LIST_DIR}/bios.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/bios_disk.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/bios_keyboard.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/bios_memdisk.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/bios_vhd.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/ems.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/int10.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/int10.h"
+	"${CMAKE_CURRENT_LIST_DIR}/int10_char.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/int10_memory.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/int10_misc.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/int10_modes.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/int10_pal.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/int10_put_pixel.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/int10_vesa.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/int10_video_state.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/int10_vptable.cpp"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/mouse.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/qcow2_disk.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/xms.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/xms.h"
+)
+source_group("Sources\\ints" FILES ${SRC_INTS})
diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt
new file mode 100644
index 000000000..6aee6a99a
--- /dev/null
+++ b/src/libs/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(SRC_LIBS
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+)
+source_group("Sources\\libs" FILES ${SRC_LIBS})
diff --git a/src/libs/gui_tk/CMakeLists.txt b/src/libs/gui_tk/CMakeLists.txt
new file mode 100644
index 000000000..4fde00aba
--- /dev/null
+++ b/src/libs/gui_tk/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(SRC_LIBS_GUI_TK
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/Doxyfile"
+	"${CMAKE_CURRENT_LIST_DIR}/gui_tk.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/gui_tk.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+)
+source_group("Sources\\libs\\gui_tk" FILES ${SRC_LIBS_GUI_TK})
diff --git a/src/libs/porttalk/CMakeLists.txt b/src/libs/porttalk/CMakeLists.txt
new file mode 100644
index 000000000..ef644d0cb
--- /dev/null
+++ b/src/libs/porttalk/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(SRC_LIBS_PORTTALK
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/porttalk.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/porttalk.h"
+	"${CMAKE_CURRENT_LIST_DIR}/PortTalk_IOCTL.h"
+)
+source_group("Sources\\libs\\porttalk" FILES ${SRC_LIBS_PORTTALK})
diff --git a/src/libs/zmbv/CMakeLists.txt b/src/libs/zmbv/CMakeLists.txt
new file mode 100644
index 000000000..652cff227
--- /dev/null
+++ b/src/libs/zmbv/CMakeLists.txt
@@ -0,0 +1,16 @@
+set(SRC_LIBS_ZMBV
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/drvproc.cpp"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/resource.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/zmbv.cpp"
+	# "${CMAKE_CURRENT_LIST_DIR}/zmbv.def"
+	"${CMAKE_CURRENT_LIST_DIR}/zmbv.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/zmbv.inf"
+	# "${CMAKE_CURRENT_LIST_DIR}/zmbv.sln"
+	# "${CMAKE_CURRENT_LIST_DIR}/zmbv.vcproj"
+	"${CMAKE_CURRENT_LIST_DIR}/zmbv_vfw.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/zmbv_vfw.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/zmbv_vfw.rc"
+)
+source_group("Sources\\libs\\zmbv" FILES ${SRC_LIBS_ZMBV})
diff --git a/src/misc/CMakeLists.txt b/src/misc/CMakeLists.txt
new file mode 100644
index 000000000..8c67cc8e9
--- /dev/null
+++ b/src/misc/CMakeLists.txt
@@ -0,0 +1,12 @@
+set(SRC_MISC
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/cross.cpp"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/messages.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/programs.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/regionalloctracking.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/setup.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/shiftjis.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/support.cpp"
+)
+source_group("Sources\\misc" FILES ${SRC_MISC})
diff --git a/src/mt32/CMakeLists.txt b/src/mt32/CMakeLists.txt
new file mode 100644
index 000000000..6a7aa79ce
--- /dev/null
+++ b/src/mt32/CMakeLists.txt
@@ -0,0 +1,46 @@
+set(SRC_MT32
+	"${CMAKE_CURRENT_LIST_DIR}/AReverbModel.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/AReverbModel.h"
+	"${CMAKE_CURRENT_LIST_DIR}/BReverbModel.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/BReverbModel.h"
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/DelayReverb.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/DelayReverb.h"
+	"${CMAKE_CURRENT_LIST_DIR}/File.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/File.h"
+	"${CMAKE_CURRENT_LIST_DIR}/FileStream.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/FileStream.h"
+	"${CMAKE_CURRENT_LIST_DIR}/FreeverbModel.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/FreeverbModel.h"
+	"${CMAKE_CURRENT_LIST_DIR}/LA32Ramp.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/LA32Ramp.h"
+	"${CMAKE_CURRENT_LIST_DIR}/LA32WaveGenerator.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/LA32WaveGenerator.h"
+	"${CMAKE_CURRENT_LIST_DIR}/LegacyWaveGenerator.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/LegacyWaveGenerator.h"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/mmath.h"
+	"${CMAKE_CURRENT_LIST_DIR}/mt32emu.h"
+	"${CMAKE_CURRENT_LIST_DIR}/Part.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/Part.h"
+	"${CMAKE_CURRENT_LIST_DIR}/Partial.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/Partial.h"
+	"${CMAKE_CURRENT_LIST_DIR}/PartialManager.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/PartialManager.h"
+	"${CMAKE_CURRENT_LIST_DIR}/Poly.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/Poly.h"
+	"${CMAKE_CURRENT_LIST_DIR}/ROMInfo.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/ROMInfo.h"
+	"${CMAKE_CURRENT_LIST_DIR}/Structures.h"
+	"${CMAKE_CURRENT_LIST_DIR}/Synth.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/Synth.h"
+	"${CMAKE_CURRENT_LIST_DIR}/Tables.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/Tables.h"
+	"${CMAKE_CURRENT_LIST_DIR}/TVA.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/TVA.h"
+	"${CMAKE_CURRENT_LIST_DIR}/TVF.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/TVF.h"
+	"${CMAKE_CURRENT_LIST_DIR}/TVP.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/TVP.h"
+)
+source_group("Sources\\mt32" FILES ${SRC_MT32})
diff --git a/src/mt32/freeverb/CMakeLists.txt b/src/mt32/freeverb/CMakeLists.txt
new file mode 100644
index 000000000..0a8651170
--- /dev/null
+++ b/src/mt32/freeverb/CMakeLists.txt
@@ -0,0 +1,12 @@
+set(SRC_MT32_FREEVERB
+	"${CMAKE_CURRENT_LIST_DIR}/allpass.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/allpass.h"
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/comb.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/comb.h"
+	"${CMAKE_CURRENT_LIST_DIR}/denormals.h"
+	"${CMAKE_CURRENT_LIST_DIR}/revmodel.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/revmodel.h"
+	"${CMAKE_CURRENT_LIST_DIR}/tuning.h"
+)
+source_group("Sources\\mt32\\freeverb" FILES ${SRC_MT32_FREEVERB})
diff --git a/src/mt32/sha1/CMakeLists.txt b/src/mt32/sha1/CMakeLists.txt
new file mode 100644
index 000000000..46a7fef94
--- /dev/null
+++ b/src/mt32/sha1/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(SRC_MT32_SHA1
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/license.txt"
+	"${CMAKE_CURRENT_LIST_DIR}/sha1.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/sha1.h"
+)
+source_group("Sources\\mt32\\sha1" FILES ${SRC_MT32_SHA1})
diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt
new file mode 100644
index 000000000..e1c9c1399
--- /dev/null
+++ b/src/platform/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(SRC_PLATFORM
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+)
+source_group("Sources\\platform" FILES ${SRC_PLATFORM})
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
new file mode 100644
index 000000000..74dd60e08
--- /dev/null
+++ b/src/shell/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(SRC_SHELL
+	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+	# "${CMAKE_CURRENT_LIST_DIR}/Makefile.am"
+	"${CMAKE_CURRENT_LIST_DIR}/shell.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/shell_batch.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/shell_cmds.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/shell_misc.cpp"
+)
+source_group("Sources\\shell" FILES ${SRC_SHELL})