diff --git a/Ports/hatari/patches/hatari-SerenityOS-cmake.patch b/Ports/hatari/patches/hatari-SerenityOS-cmake.patch deleted file mode 100644 index b41bcf9db79..00000000000 --- a/Ports/hatari/patches/hatari-SerenityOS-cmake.patch +++ /dev/null @@ -1,1187 +0,0 @@ -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/cmake/FindMath.cmake hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/cmake/FindMath.cmake ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/cmake/FindMath.cmake 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/cmake/FindMath.cmake 1970-01-01 01:00:00.000000000 +0100 -@@ -1,15 +0,0 @@ -- --if(MATH_INCLUDE_DIR) -- # Already in cache, be silent -- set(MATH_FIND_QUIETLY TRUE) --endif(MATH_INCLUDE_DIR) -- --find_path(MATH_INCLUDE_DIR math.h) -- --find_library(MATH_LIBRARY NAMES m) -- --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(Math DEFAULT_MSG -- MATH_LIBRARY MATH_INCLUDE_DIR) -- --mark_as_advanced(MATH_LIBRARY MATH_INCLUDE_DIR) -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/cmake/FindSDL2.cmake hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/cmake/FindSDL2.cmake ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/cmake/FindSDL2.cmake 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/cmake/FindSDL2.cmake 1970-01-01 01:00:00.000000000 +0100 -@@ -1,177 +0,0 @@ --# Locate SDL2 library --# This module defines --# SDL2_LIBRARY, the name of the library to link against --# SDL2_FOUND, if false, do not try to link to SDL2 --# SDL2_INCLUDE_DIR, where to find SDL.h --# --# This module responds to the the flag: --# SDL2_BUILDING_LIBRARY --# If this is defined, then no SDL2main will be linked in because --# only applications need main(). --# Otherwise, it is assumed you are building an application and this --# module will attempt to locate and set the the proper link flags --# as part of the returned SDL2_LIBRARY variable. --# --# Don't forget to include SDLmain.h and SDLmain.m your project for the --# macOS framework based version. (Other versions link to -lSDL2main which --# this module will try to find on your behalf.) Also for macOS, this --# module will automatically add the -framework Cocoa on your behalf. --# --# --# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration --# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library --# (SDL2.dll, libsdl2.so, SDL2.framework, etc). --# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again. --# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value --# as appropriate. These values are used to generate the final SDL2_LIBRARY --# variable, but when these values are unset, SDL2_LIBRARY does not get created. --# --# --# $SDL2DIR is an environment variable that would --# correspond to the ./configure --prefix=$SDL2DIR --# used in building SDL2. --# l.e.galup 9-20-02 --# --# Modified by Eric Wing. --# Added code to assist with automated building by using environmental variables --# and providing a more controlled/consistent search behavior. --# Added new modifications to recognize macOS frameworks and --# additional Unix paths (FreeBSD, etc). --# Also corrected the header search path to follow "proper" SDL guidelines. --# Added a search for SDL2main which is needed by some platforms. --# Added a search for threads which is needed by some platforms. --# Added needed compile switches for MinGW. --# --# On OSX, this will prefer the Framework version (if found) over others. --# People will have to manually change the cache values of --# SDL2_LIBRARY to override this selection or set the CMake environment --# CMAKE_INCLUDE_PATH to modify the search paths. --# --# Note that the header path has changed from SDL2/SDL.h to just SDL.h --# This needed to change because "proper" SDL convention --# is #include "SDL.h", not . This is done for portability --# reasons because not all systems place things in SDL2/ (see FreeBSD). -- --#============================================================================= --# Copyright 2003-2009 Kitware, Inc. --# --# Distributed under the OSI-approved BSD License (the "License"); --# see http://www.cmake.org/cmake/project/license.html for details. --# --# This software is distributed WITHOUT ANY WARRANTY; without even the --# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. --# See the License for more information. --#============================================================================= -- --SET(SDL2_SEARCH_PATHS -- ~/Library/Frameworks -- /Library/Frameworks -- /usr/local -- /usr -- /sw # Fink -- /opt/local # DarwinPorts -- /opt/csw # Blastwave -- /opt --) -- --FIND_PATH(SDL2_INCLUDE_DIR SDL_scancode.h -- HINTS -- $ENV{SDL2DIR} -- PATH_SUFFIXES SDL2 include/SDL2 include -- PATHS ${SDL2_SEARCH_PATHS} --) -- --FIND_LIBRARY(SDL2_LIBRARY_TEMP -- NAMES SDL2 -- HINTS -- $ENV{SDL2DIR} -- PATH_SUFFIXES lib64 lib -- PATHS ${SDL2_SEARCH_PATHS} --) -- --IF(NOT SDL2_BUILDING_LIBRARY) -- IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework") -- # Non-macOS framework versions expect you to also dynamically link to -- # SDL2main. This is mainly for Windows and macOS. Other (Unix) platforms -- # seem to provide SDL2main for compatibility even though they don't -- # necessarily need it. -- FIND_LIBRARY(SDL2MAIN_LIBRARY -- NAMES SDL2main -- HINTS -- $ENV{SDL2DIR} -- PATH_SUFFIXES lib64 lib -- PATHS ${SDL2_SEARCH_PATHS} -- ) -- ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework") --ENDIF(NOT SDL2_BUILDING_LIBRARY) -- --# SDL2 may require threads on your system. --# The Apple build may not need an explicit flag because one of the --# frameworks may already provide it. --# But for non-OSX systems, I will use the CMake Threads package. --IF(NOT APPLE) -- FIND_PACKAGE(Threads) --ENDIF(NOT APPLE) -- --# MinGW needs an additional library, mwindows --# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows --# (Actually on second look, I think it only needs one of the m* libraries.) --IF(MINGW) -- SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW") --ENDIF(MINGW) -- --IF(SDL2_LIBRARY_TEMP) -- # For SDL2main -- IF(NOT SDL2_BUILDING_LIBRARY) -- IF(SDL2MAIN_LIBRARY) -- SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP}) -- ENDIF(SDL2MAIN_LIBRARY) -- ENDIF(NOT SDL2_BUILDING_LIBRARY) -- -- # For macOS, SDL2 uses Cocoa as a backend so it must link to Cocoa. -- # CMake doesn't display the -framework Cocoa string in the UI even -- # though it actually is there if I modify a pre-used variable. -- # I think it has something to do with the CACHE STRING. -- # So I use a temporary variable until the end so I can set the -- # "real" variable in one-shot. -- IF(APPLE) -- SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa") -- ENDIF(APPLE) -- -- # For threads, as mentioned Apple doesn't need this. -- # In fact, there seems to be a problem if I used the Threads package -- # and try using this line, so I'm just skipping it entirely for macOS. -- IF(NOT APPLE) -- SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT}) -- ENDIF(NOT APPLE) -- -- # For MinGW library -- IF(MINGW) -- SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP}) -- ENDIF(MINGW) -- -- # Set the final string here so the GUI reflects the final state. -- SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found") -- # Set the temp variable to INTERNAL so it is not seen in the CMake GUI -- SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "") --ENDIF(SDL2_LIBRARY_TEMP) -- --if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h") -- file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$") -- file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$") -- file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$") -- string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}") -- string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}") -- string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}") -- set(SDL2_VERSION_STRING ${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH}) -- unset(SDL2_VERSION_MAJOR_LINE) -- unset(SDL2_VERSION_MINOR_LINE) -- unset(SDL2_VERSION_PATCH_LINE) -- unset(SDL2_VERSION_MAJOR) -- unset(SDL2_VERSION_MINOR) -- unset(SDL2_VERSION_PATCH) --endif() -- --INCLUDE(FindPackageHandleStandardArgs) -- --FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/CMakeLists.txt hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/CMakeLists.txt ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/CMakeLists.txt 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/CMakeLists.txt 2021-04-12 01:33:11.661432941 +0200 -@@ -1,12 +1,13 @@ - cmake_minimum_required(VERSION 3.3 FATAL_ERROR) - --project(Hatari C) -+project(hatari C) - enable_testing() - --set(APP_NAME "Hatari") -+set(APP_NAME "hatari") - --set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") -+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) - -+include(FindPkgConfig) - include(CheckIncludeFiles) - include(CheckFunctionExists) - include(CheckStructHasMember) -@@ -40,16 +41,15 @@ - endfunction (check_large_file) - - -- - # ########################## - # Conditional build features - # ########################## - - set(ENABLE_DSP_EMU 1 - CACHE BOOL "Enable DSP 56k emulator for Falcon mode") --set(ENABLE_TRACING 1 -+set(ENABLE_TRACING 0 - CACHE BOOL "Enable tracing messages for debugging") --set(ENABLE_SMALL_MEM 0 -+set(ENABLE_SMALL_MEM 1 - CACHE BOOL "Enable to use less memory - at the expense of emulation speed") - - # Run-time checks with GCC / LLVM (Clang) AddressSanitizer: -@@ -81,29 +81,18 @@ - set(ENABLE_MAN_PAGES 0 CACHE BOOL "Built and install man pages") - endif() - --if(APPLE) -- set(ENABLE_OSX_BUNDLE 1 -- CACHE BOOL "Built Hatari as macOS application bundle") -- # set(CMAKE_OSX_ARCHITECTURES "i386" CACHE STRING "Target architectures" FORCE) -- # set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk" CACHE STRING "10.6 SDK" FORCE) -- # set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "Target Min 10.5" FORCE) -- set(ADDITIONAL_INCLUDES ${FRAMEWORKS}) -- set_source_files_properties(${FRAMEWORKS} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks) --else() -- set(ENABLE_OSX_BUNDLE 0 -+set(ENABLE_OSX_BUNDLE 0 - CACHE BOOL "Built Hatari as macOS application bundle") --endif(APPLE) - - # #################### - # Check for libraries: - # #################### - --find_package(SDL2) --if(NOT SDL2_FOUND) -- message(FATAL_ERROR "SDL2 library not found!") --endif(NOT SDL2_FOUND) -- --find_package(Math) -+find_package(SDL2 REQUIRED) -+if("${SDL2_LIBRARIES}" STREQUAL "") -+ message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2") -+ set(SDL2_LIBRARIES "SDL2::SDL2") -+endif() - - find_package(Readline) - if(Readline_FOUND) -@@ -175,13 +164,6 @@ - # message(STATUS "Additional CFLAGS of SDL: ${DETECTED_SDL_CFLAGS}") - endif(DETECTED_SDL_CFLAGS) - --if(ENABLE_OSX_BUNDLE) -- # Use OSX native alert windows -- add_definitions(-DALERT_HOOKS=1) -- # We still want to use our SDLMain.m with SDL2 -- add_definitions(-DSDL_MAIN_NEEDED=1) --endif(ENABLE_OSX_BUNDLE) -- - # ########################### - # Check for optional headers: - # ########################### -@@ -189,7 +171,7 @@ - check_include_files(termios.h HAVE_TERMIOS_H) - check_include_files(sys/ioctl.h HAVE_SYS_IOCTL_H) - check_include_files(strings.h HAVE_STRINGS_H) --check_include_files(${SDL2_INCLUDE_DIR}/SDL_config.h HAVE_SDL_CONFIG_H) -+check_include_files(${SDL2_INCLUDE_DIRS}/SDL_config.h HAVE_SDL_CONFIG_H) - check_include_files(sys/time.h HAVE_SYS_TIME_H) - check_include_files(sys/times.h HAVE_SYS_TIMES_H) - check_include_files(utime.h HAVE_UTIME_H) -@@ -268,16 +250,8 @@ - endif() - - if(NOT BIN2DATADIR) -- if(WIN32) -- set(BIN2DATADIR "." -- CACHE STRING "Relative path from bindir to datadir") -- elseif(ENABLE_OSX_BUNDLE) -- set(BIN2DATADIR "../Resources" -+ set(BIN2DATADIR "../share/hatari" - CACHE STRING "Relative path from bindir to datadir") -- else() -- set(BIN2DATADIR "../share/hatari" -- CACHE STRING "Relative path from bindir to datadir") -- endif(WIN32) - mark_as_advanced(BIN2DATADIR) - endif() - -@@ -290,23 +264,14 @@ - endif() - - if(NOT ETCDIR) -- if(WIN32) -- set(ETCDIR .) -- else() -- set(ETCDIR /etc) -- endif() -+ set(ETCDIR /etc) - endif() - - if(NOT ICONDIR) - set(ICONDIR share/icons/hicolor) - endif() - --if(ENABLE_OSX_BUNDLE) -- # put the config files in the app's bundle -- add_definitions(-DCONFDIR=\"../Resources\") --else() -- add_definitions(-DCONFDIR=\"${ETCDIR}\") --endif() -+add_definitions(-DCONFDIR=\"${ETCDIR}\") - - # ######################################### - # Create config.h and recurse into subdirs: -@@ -407,4 +372,4 @@ - message(" ==> using inaccurate SDL_GetTicks() instead") - endif() - --message( "" ) -+message( "" ) -\ No newline at end of file -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/audio.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/audio.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/audio.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/audio.c 2021-04-12 01:33:11.661432941 +0200 -@@ -8,7 +8,7 @@ - */ - const char Audio_fileid[] = "Hatari audio.c"; - --#include -+#include - - #include "main.h" - #include "audio.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/avi_record.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/avi_record.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/avi_record.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/avi_record.c 2021-04-12 01:33:11.661432941 +0200 -@@ -80,8 +80,8 @@ - - const char AVIRecord_fileid[] = "Hatari avi_record.c"; - --#include --#include -+#include -+#include - #include /* For off_t */ - - #include "main.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/blitter.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/blitter.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/blitter.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/blitter.c 2021-04-12 01:33:11.661432941 +0200 -@@ -104,7 +104,7 @@ - - const char Blitter_fileid[] = "Hatari blitter.c"; - --#include -+#include - #include - #include - -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/clocks_timings.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/clocks_timings.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/clocks_timings.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/clocks_timings.c 2021-04-12 01:33:11.661432941 +0200 -@@ -119,8 +119,8 @@ - - const char ClocksTimings_fileid[] = "Hatari clocks_timings.c"; - --#include --#include -+#include -+#include - - #include "main.h" - #include "configuration.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/CMakeLists.txt hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/CMakeLists.txt ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/CMakeLists.txt 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/CMakeLists.txt 2021-04-12 01:33:11.661432941 +0200 -@@ -14,38 +14,8 @@ - # Disk image code is shared with the hmsa tool, so we put it into a library: - add_library(Floppy createBlankImage.c dim.c msa.c st.c zip.c) - --# When building for macOS, define specific sources for gui and resources --if(ENABLE_OSX_BUNDLE) -- set(GUIOSX_SOURCES -- gui-osx/AlertHooks.m gui-osx/PrefsController.m gui-osx/Shared.m -- gui-osx/CreateFloppyController.m gui-osx/SDLMain.m gui-osx/paths.m) -- set_source_files_properties(${GUIOSX_SOURCES} PROPERTIES LANGUAGE C) -- set(GUIOSX_RSRCS -- gui-osx/Hatari.icns gui-osx/stdisk.png gui-osx/en.lproj gui-osx/fr.lproj) -- set(GUIOSX_DOCS -- ${CMAKE_SOURCE_DIR}/doc/manual.html ${CMAKE_SOURCE_DIR}/doc/images -- ${CMAKE_SOURCE_DIR}/doc/compatibility.html ${CMAKE_SOURCE_DIR}/doc/toc.js ) -- # these are the macOS Interface Builder Files -- set (HATARI_XIBS en.lproj/SDLMain fr.lproj/SDLMain) --elseif(APPLE) -- set(SOURCES ${SOURCES} gui-osx/paths.m) --endif() -- --# When building for Windows, define specific sources for gui and resources --# and set the subsystem of the resulting .exe to "windows GUI" instead of "console" --# Recent mingw version sets _FORTIFY_SOURCE, which requires to link with lib ssp. --# We use "--as-needed" to keep compatibility with older mingw that don't require lib ssp --if(WIN32) -- set(GUIWIN_SOURCES gui-win/opencon.c) -- set(GUIWIN_RES gui-win/hatari-winicon.rc) -- if(CMAKE_COMPILER_IS_GNUCC) -- set(CMAKE_EXE_LINKER_FLAGS -- "${CMAKE_EXE_LINKER_FLAGS} -mwindows -Wl,--as-needed -lssp") -- endif(CMAKE_COMPILER_IS_GNUCC) --endif(WIN32) -- --include_directories(includes debug falcon -- ${CMAKE_BINARY_DIR} ${SDL2_INCLUDE_DIR} cpu) -+include_directories(hatari SYSTEM PRIVATE includes debug falcon -+ ${CMAKE_BINARY_DIR} cpu ${SDL2_INCLUDE_DIRS}) - - if(ZLIB_FOUND) - include_directories(${ZLIB_INCLUDE_DIR}) -@@ -74,81 +44,9 @@ - add_subdirectory(gui-sdl) - add_subdirectory(cpu) - --# When building for macOS, add specific sources --if(ENABLE_OSX_BUNDLE) -- #find_library(SDL_FRAMEWORK SDL ${ADD_FRAMEWOK_PATH}) -- set(ADDITIONAL_INCLUDES ${FRAMEWORKS}) -- set_source_files_properties(${FRAMEWORKS} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks) -- add_executable(hatari MACOSX_BUNDLE ${GUIOSX_RSRCS} ${GUIOSX_DOCS} ${SOURCES} ${GUIOSX_SOURCES} ${FRAMEWORKS}) -- set_target_properties(hatari PROPERTIES MACOSX_BUNDLE_INFO_PLIST -- ${CMAKE_CURRENT_SOURCE_DIR}/gui-osx/Info-Hatari.plist) -- set(MACOSX_BUNDLE_ICON_FILE Hatari.icns) -- if(CMAKE_GENERATOR MATCHES "Xcode") -- set(BUNDLE_CONTENTS ${CMAKE_CURRENT_BINARY_DIR}/\${CONFIGURATION}/Hatari.app/Contents) -- else() -- set(BUNDLE_CONTENTS ${CMAKE_CURRENT_BINARY_DIR}/Hatari.app/Contents) -- endif() -- # Create Hatari.app bundle -- add_custom_target(osx_bundle_dirs -- COMMAND mkdir -p ${BUNDLE_CONTENTS}/Resources -- #COMMAND mkdir -p ${BUNDLE_CONTENTS}/Frameworks -- COMMAND mkdir -p ${BUNDLE_CONTENTS}/MacOS -- COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/gui-osx/${MACOSX_BUNDLE_ICON_FILE} -- ${BUNDLE_CONTENTS}/Resources/${MACOSX_BUNDLE_ICON_FILE} -- # Copy Localized .nib and help to Bundle -- COMMAND cp -R ${CMAKE_CURRENT_SOURCE_DIR}/gui-osx/*.lproj ${BUNDLE_CONTENTS}/Resources/ -- COMMAND mkdir -p ${BUNDLE_CONTENTS}/Resources/HatariHelp -- COMMAND cp -R ${GUIOSX_DOCS} ${BUNDLE_CONTENTS}/Resources/HatariHelp/ -- #COMMAND mkdir -p ${BUNDLE_CONTENTS}/Resources/fr.lproj/HatariHelp -- #COMMAND cp -R ${GUIOSX_DOCS} ${BUNDLE_CONTENTS}/Resources/fr.lproj/HatariHelp/ -- ) -- add_dependencies(hatari osx_bundle_dirs) -- set_source_files_properties(${GUIOSX_RSRCS} PROPERTIES -- MACOSX_PACKAGE_LOCATION Resources) -- set_source_files_properties(${GUIOSX_DOCS} PROPERTIES -- MACOSX_PACKAGE_LOCATION Resources/HatariHelp) -- -- #find ibtool -- find_program(IBTOOL ibtool HINTS "/usr/bin" "${OSX_DEVELOPER_ROOT}/usr/bin") -- if (${IBTOOL} STREQUAL "IBTOOL-NOTFOUND") -- message(SEND_ERROR "ibtool can not be found and is needed to compile the .xib files. -- It should have been installed with the Apple developer tools. The default -- system paths were searched in addition to ${OSX_DEVELOPER_ROOT}/usr/bin") -- endif() -- # Compile the .xib files using the 'ibtool' program with the destination being the app package -- foreach(xib ${HATARI_XIBS}) -- add_custom_command (TARGET hatari POST_BUILD -- COMMAND ${IBTOOL} --errors --warnings --notices --output-format human-readable-text -- --compile ${BUNDLE_CONTENTS}/Resources/${xib}.nib ${CMAKE_CURRENT_SOURCE_DIR}/gui-osx/${xib}.xib -- COMMAND rm ${BUNDLE_CONTENTS}/Resources/${xib}.xib -- COMMENT "Compiling ${CMAKE_CURRENT_SOURCE_DIR}/gui-osx/${xib}.xib") -- endforeach() -- --# When building for Windows, add specific sources + method to compile .rc files --elseif(WIN32) -- # Set a default rc compiler if it was not defined yet -- if(NOT CMAKE_RC_COMPILER) -- set(CMAKE_RC_COMPILER windres) -- endif(NOT CMAKE_RC_COMPILER) -- ENABLE_LANGUAGE(RC) -- set(CMAKE_RC_COMPILE_OBJECT " -Ocoff -o ") -- set_source_files_properties(${GUIWIN_RES} PROPERTIES LANGUAGE RC) -- add_executable(hatari ${GUIWIN_RES} ${SOURCES} ${GUIWIN_SOURCES}) -- --# Other targets, use default sources --else() -- add_executable(hatari ${SOURCES}) --endif(ENABLE_OSX_BUNDLE) -- --target_link_libraries(hatari Falcon UaeCpu GuiSdl Floppy Debug ${SDL2_LIBRARY}) -- --if(MATH_FOUND AND NOT APPLE) -- target_link_libraries(hatari ${MATH_LIBRARY}) --endif() -- --if(SDL2MAIN_LIBRARY) -- target_link_libraries(hatari ${SDL2MAIN_LIBRARY}) --endif(SDL2MAIN_LIBRARY) -+add_executable(hatari ${SOURCES}) -+target_include_directories(hatari SYSTEM PRIVATE ${SDL2_INCLUDE_DIRS}) -+target_link_libraries(hatari PRIVATE Falcon UaeCpu GuiSdl Floppy Debug ${SDL2_LIBRARIES} m) - - if(READLINE_FOUND) - target_link_libraries(hatari ${READLINE_LIBRARY}) -@@ -182,19 +80,9 @@ - target_link_libraries(hatari ${UDEV_LIBRARY}) - endif(UDEV_FOUND) - --if(WIN32) -- # Needed for socket() on Windows -- target_link_libraries(hatari ws2_32) --endif(WIN32) -- -- --if(ENABLE_OSX_BUNDLE) -- install(TARGETS hatari BUNDLE DESTINATION /Applications) --else() -- install(TARGETS hatari RUNTIME DESTINATION ${BINDIR}) -- install(FILES hatari-icon.bmp DESTINATION ${DATADIR}) -- file(GLOB TOS_IMG_FILE tos.img) -- if(TOS_IMG_FILE) -- install(FILES tos.img DESTINATION ${DATADIR}) -- endif(TOS_IMG_FILE) --endif(ENABLE_OSX_BUNDLE) -+install(TARGETS hatari RUNTIME DESTINATION ${BINDIR}) -+install(FILES hatari-icon.bmp DESTINATION ${DATADIR}) -+file(GLOB TOS_IMG_FILE tos.img) -+if(TOS_IMG_FILE) -+ install(FILES tos.img DESTINATION ${DATADIR}) -+endif(TOS_IMG_FILE) -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/configuration.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/configuration.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/configuration.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/configuration.c 2021-04-12 01:33:11.661432941 +0200 -@@ -11,7 +11,7 @@ - */ - const char Configuration_fileid[] = "Hatari configuration.c"; - --#include -+#include - #include - - #include "main.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/cpu/CMakeLists.txt hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/cpu/CMakeLists.txt ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/cpu/CMakeLists.txt 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/cpu/CMakeLists.txt 2021-04-12 01:33:11.661432941 +0200 -@@ -1,5 +1,5 @@ - --include_directories(. ../.. ../includes ${SDL2_INCLUDE_DIR} softfloat -+include_directories(. ../.. ../includes ${SDL2_INCLUDE_DIRS} softfloat - ${CMAKE_CURRENT_BINARY_DIR}) - - # The sources generated by gencpu: -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/cpu/maccess.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/cpu/maccess.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/cpu/maccess.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/cpu/maccess.h 2021-04-12 01:33:11.661432941 +0200 -@@ -14,7 +14,7 @@ - #ifndef UAE_MACCESS_H - #define UAE_MACCESS_H - --#include -+#include - - /* Can the actual CPU access unaligned memory? */ - #ifndef CPU_CAN_ACCESS_UNALIGNED -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/cpu/memory.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/cpu/memory.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/cpu/memory.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/cpu/memory.c 2021-04-12 01:33:11.661432941 +0200 -@@ -12,7 +12,7 @@ - */ - const char Memory_fileid[] = "Hatari memory.c"; - --#include -+#include - #include "main.h" - #include "sysdeps.h" - #include "hatari-glue.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/debug/debugui.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/debug/debugui.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/debug/debugui.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/debug/debugui.c 2021-04-12 01:33:11.661432941 +0200 -@@ -13,7 +13,7 @@ - #include - #include - #include --#include -+#include - - #include "config.h" - -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/debug/evaluate.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/debug/evaluate.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/debug/evaluate.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/debug/evaluate.c 2021-04-12 01:33:11.661432941 +0200 -@@ -20,7 +20,7 @@ - #include - #include - #include --#include -+#include - #include - #include "configuration.h" - #include "dsp.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/debug/log.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/debug/log.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/debug/log.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/debug/log.h 2021-04-12 01:33:11.661432941 +0200 -@@ -8,7 +8,7 @@ - #define HATARI_LOG_H - - #include --#include -+#include - - - /* Exception debugging -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/debug/symbols.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/debug/symbols.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/debug/symbols.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/debug/symbols.c 2021-04-12 01:33:11.661432941 +0200 -@@ -23,8 +23,8 @@ - #include - #include - #include --#include --#include -+#include -+#include - #include "main.h" - #include "file.h" - #include "options.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/falcon/dsp_core.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/falcon/dsp_core.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/falcon/dsp_core.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/falcon/dsp_core.h 2021-04-12 01:33:11.661432941 +0200 -@@ -22,7 +22,7 @@ - #ifndef DSP_CORE_H - #define DSP_CORE_H - --#include -+#include - - #ifdef __cplusplus - extern "C" { -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/floppy.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/floppy.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/floppy.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/floppy.c 2021-04-12 01:33:11.661432941 +0200 -@@ -25,7 +25,7 @@ - - #include - #include --#include -+#include - - #include "main.h" - #include "configuration.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/gui-sdl/CMakeLists.txt hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/gui-sdl/CMakeLists.txt ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/gui-sdl/CMakeLists.txt 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/gui-sdl/CMakeLists.txt 2021-04-12 01:33:11.661432941 +0200 -@@ -1,5 +1,5 @@ - --include_directories(. ../.. ../debug ../includes ${SDL2_INCLUDE_DIR}) -+include_directories(. ../.. ../debug ../includes ${SDL2_INCLUDE_DIRS}) - - if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-write-strings") -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/gui-sdl/dlgFileSelect.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/gui-sdl/dlgFileSelect.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/gui-sdl/dlgFileSelect.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/gui-sdl/dlgFileSelect.c 2021-04-12 01:33:11.661432941 +0200 -@@ -8,7 +8,7 @@ - */ - const char DlgFileSelect_fileid[] = "Hatari dlgFileSelect.c"; - --#include -+#include - #include - #include - -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/gui-sdl/sdlgui.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/gui-sdl/sdlgui.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/gui-sdl/sdlgui.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/gui-sdl/sdlgui.c 2021-04-12 01:33:11.661432941 +0200 -@@ -8,7 +8,7 @@ - */ - const char SDLGui_fileid[] = "Hatari sdlgui.c"; - --#include -+#include - #include - #include - #include -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/hdc.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/hdc.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/hdc.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/hdc.c 2021-04-12 01:33:11.661432941 +0200 -@@ -9,7 +9,7 @@ - const char HDC_fileid[] = "Hatari hdc.c"; - - #include --#include -+#include - - #include "main.h" - #include "configuration.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/ide.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/ide.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/ide.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/ide.c 2021-04-12 01:33:11.661432941 +0200 -@@ -7,7 +7,7 @@ - This is where we intercept read/writes to/from the IDE controller hardware. - */ - --#include -+#include - #include - - #include -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/cycles.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/cycles.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/cycles.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/cycles.h 2021-04-12 01:33:11.661432941 +0200 -@@ -9,7 +9,7 @@ - #define HATARI_CYCLES_H - - #include --#include -+#include - - enum - { -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/keymap.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/keymap.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/keymap.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/keymap.h 2021-04-12 01:33:11.661432941 +0200 -@@ -8,7 +8,7 @@ - #ifndef HATARI_KEYMAP_H - #define HATARI_KEYMAP_H - --#include -+#include - - /* TODO: Get rid of these defines later... */ - #define SDLKey SDL_Keycode -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/main.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/main.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/main.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/main.h 2021-04-12 01:33:11.661432941 +0200 -@@ -14,7 +14,7 @@ - #include - #include - --#include -+#include - #include - #include - -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/screen.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/screen.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/screen.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/screen.h 2021-04-12 01:33:11.661432941 +0200 -@@ -8,7 +8,7 @@ - #ifndef HATARI_SCREEN_H - #define HATARI_SCREEN_H - --#include /* for SDL_Surface */ -+#include /* for SDL_Surface */ - - extern SDL_Window *sdlWindow; - -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/screenSnapShot.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/screenSnapShot.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/screenSnapShot.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/screenSnapShot.h 2021-04-12 01:33:11.661432941 +0200 -@@ -8,7 +8,7 @@ - #ifndef HATARI_SCREENSNAPSHOT_H - #define HATARI_SCREENSNAPSHOT_H - --#include -+#include - - extern int ScreenSnapShot_SavePNG_ToFile(SDL_Surface *surface, int destw, - int desth, FILE *fp, int png_compression_level, int png_filter, -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/sdlgui.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/sdlgui.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/sdlgui.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/sdlgui.h 2021-04-12 01:33:11.661432941 +0200 -@@ -10,7 +10,7 @@ - #ifndef HATARI_SDLGUI_H - #define HATARI_SDLGUI_H - --#include -+#include - - /* object types: */ - enum -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/sound.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/sound.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/sound.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/sound.h 2021-04-12 01:33:11.661432941 +0200 -@@ -23,7 +23,7 @@ - extern bool Sound_BufferIndexNeedReset; - - /* STSound sound renderer active */ --#include -+#include - - - /* Internal data types */ -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/statusbar.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/statusbar.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/statusbar.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/statusbar.h 2021-04-12 01:33:11.661432941 +0200 -@@ -7,7 +7,7 @@ - #ifndef HATARI_STATUSBAR_H - #define HATARI_STATUSBAR_H - --#include -+#include - - /* must correspond to max value returned by Statusbar_GetHeightForSize() */ - #define STATUSBAR_MAX_HEIGHT (2*(2*8+2)) -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/utils.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/utils.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/includes/utils.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/includes/utils.h 2021-04-12 01:33:11.661432941 +0200 -@@ -7,7 +7,7 @@ - #ifndef HATARI_UTILS_H - #define HATARI_UTILS_H - --#include -+#include - - - #define CRC32_POLY 0x04c11db7 /* IEEE 802.3 recommendation */ -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/inffile.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/inffile.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/inffile.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/inffile.c 2021-04-12 01:33:11.661432941 +0200 -@@ -8,7 +8,7 @@ - */ - const char INFFILE_fileid[] = "Hatari inffile.c"; - --#include -+#include - #include - #include - #include -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/joy.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/joy.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/joy.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/joy.c 2021-04-12 01:33:11.661432941 +0200 -@@ -10,7 +10,7 @@ - */ - const char Joy_fileid[] = "Hatari joy.c"; - --#include -+#include - - #include "main.h" - #include "configuration.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/lilo.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/lilo.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/lilo.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/lilo.c 2021-04-12 01:33:11.661432941 +0200 -@@ -19,7 +19,7 @@ - #include "stMemory.h" /* STRam etc */ - #include "symbols.h" - #include --#include -+#include - - bool bUseLilo; - -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/main.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/main.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/main.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/main.c 2021-04-12 01:33:27.341750432 +0200 -@@ -10,7 +10,7 @@ - - #include - #include --#include -+#include - - #include "main.h" - #include "version.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/memorySnapShot.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/memorySnapShot.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/memorySnapShot.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/memorySnapShot.c 2021-04-12 01:33:11.661432941 +0200 -@@ -18,7 +18,7 @@ - */ - const char MemorySnapShot_fileid[] = "Hatari memorySnapShot.c"; - --#include -+#include - #include - - #include "main.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/midi.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/midi.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/midi.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/midi.c 2021-04-12 01:33:11.661432941 +0200 -@@ -22,7 +22,7 @@ - */ - const char Midi_fileid[] = "Hatari midi.c"; - --#include -+#include - - #include "main.h" - #include "configuration.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/msa.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/msa.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/msa.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/msa.c 2021-04-12 01:33:11.661432941 +0200 -@@ -8,7 +8,7 @@ - */ - const char MSA_fileid[] = "Hatari msa.c"; - --#include -+#include - - #include "main.h" - #include "file.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/options.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/options.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/options.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/options.c 2021-04-12 01:33:11.661432941 +0200 -@@ -18,7 +18,7 @@ - #include - #include - #include --#include -+#include - - #include "main.h" - #include "version.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/resolution.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/resolution.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/resolution.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/resolution.c 2021-04-12 01:33:11.661432941 +0200 -@@ -8,7 +8,7 @@ - */ - const char Resolution_fileid[] = "Hatari resolution.c"; - --#include -+#include - #include "main.h" - #include "configuration.h" - #include "log.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/rs232.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/rs232.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/rs232.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/rs232.c 2021-04-12 01:33:11.661432941 +0200 -@@ -15,7 +15,7 @@ - */ - const char RS232_fileid[] = "Hatari rs232.c"; - --#include -+#include - #include - #include - -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/screen.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/screen.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/screen.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/screen.c 2021-04-12 01:33:11.661432941 +0200 -@@ -26,8 +26,8 @@ - - const char Screen_fileid[] = "Hatari screen.c"; - --#include --#include -+#include -+#include - #include - - #include "main.h" -@@ -493,7 +493,7 @@ - int rm, bm, gm; - SDL_RendererInfo sRenderInfo = { 0 }; - -- sdlRenderer = SDL_CreateRenderer(sdlWindow, -1, 0); -+ sdlRenderer = SDL_CreateRenderer(sdlWindow, -1, SDL_RENDERER_SOFTWARE); - if (!sdlRenderer) - { - fprintf(stderr, "ERROR: Failed to create %dx%d renderer!\n", -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/screenConvert.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/screenConvert.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/screenConvert.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/screenConvert.c 2021-04-12 01:33:11.661432941 +0200 -@@ -5,7 +5,7 @@ - or at your option any later version. Read the file gpl.txt for details. - */ - --#include -+#include - #include "main.h" - #include "configuration.h" - #include "log.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/screenSnapShot.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/screenSnapShot.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/screenSnapShot.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/screenSnapShot.c 2021-04-12 01:33:11.661432941 +0200 -@@ -8,7 +8,7 @@ - */ - const char ScreenSnapShot_fileid[] = "Hatari screenSnapShot.c"; - --#include -+#include - #include - #include - #include "main.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/shortcut.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/shortcut.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/shortcut.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/shortcut.c 2021-04-12 01:33:11.661432941 +0200 -@@ -8,7 +8,7 @@ - */ - const char ShortCut_fileid[] = "Hatari shortcut.c"; - --#include -+#include - - #include "main.h" - #include "dialog.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/spec512.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/spec512.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/spec512.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/spec512.c 2021-04-12 01:33:11.661432941 +0200 -@@ -68,7 +68,7 @@ - - const char Spec512_fileid[] = "Hatari spec512.c"; - --#include -+#include - - #include "main.h" - #include "configuration.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/str.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/str.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/str.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/str.c 2021-04-12 01:33:11.661432941 +0200 -@@ -13,7 +13,7 @@ - #include - #include - #include --#include -+#include - #include "configuration.h" - #include "str.h" - -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/tos.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/tos.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/tos.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/tos.c 2021-04-12 01:33:11.661432941 +0200 -@@ -18,7 +18,7 @@ - to select any of these images we bring up an error. */ - const char TOS_fileid[] = "Hatari tos.c"; - --#include -+#include - - #include "main.h" - #include "configuration.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/video.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/video.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/video.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/video.c 2021-04-12 01:33:11.664766340 +0200 -@@ -425,7 +425,7 @@ - - const char Video_fileid[] = "Hatari video.c"; - --#include -+#include - - #include "main.h" - #include "configuration.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/wavFormat.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/wavFormat.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/src/wavFormat.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/src/wavFormat.c 2021-04-12 01:33:11.664766340 +0200 -@@ -35,7 +35,7 @@ - */ - const char WAVFormat_fileid[] = "Hatari wavFormat.c"; - --#include -+#include - - #include "main.h" - #include "audio.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tests/debugger/CMakeLists.txt hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tests/debugger/CMakeLists.txt ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tests/debugger/CMakeLists.txt 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tests/debugger/CMakeLists.txt 2021-04-12 01:33:11.664766340 +0200 -@@ -3,7 +3,7 @@ - - include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src/includes - ${CMAKE_SOURCE_DIR}/src/debug ${CMAKE_SOURCE_DIR}/src/falcon -- ${CMAKE_SOURCE_DIR}/src/debug ${SDL2_INCLUDE_DIR} -+ ${CMAKE_SOURCE_DIR}/src/debug ${SDL2_INCLUDE_DIRS} - ${CMAKE_SOURCE_DIR}/src/cpu) - - add_library(DebuggerTestLib test-dummies.c ${CMAKE_SOURCE_DIR}/src/str.c -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tests/debugger/test-evaluate.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tests/debugger/test-evaluate.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tests/debugger/test-evaluate.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tests/debugger/test-evaluate.c 2021-04-12 01:33:11.664766340 +0200 -@@ -3,7 +3,7 @@ - * (including Hatari variable and CPU register values in expressions) - */ - #include --#include -+#include - #include - #include "stMemory.h" - #include "evaluate.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tests/debugger/test-symbols.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tests/debugger/test-symbols.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tests/debugger/test-symbols.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tests/debugger/test-symbols.c 2021-04-12 01:33:11.664766340 +0200 -@@ -2,7 +2,7 @@ - * Code to test Hatari symbol/address (re-)loading in src/debug/symbols.c - */ - #include --#include -+#include - #include - #include "debug_priv.h" - #include "symbols.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tools/debugger/CMakeLists.txt hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tools/debugger/CMakeLists.txt ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tools/debugger/CMakeLists.txt 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tools/debugger/CMakeLists.txt 2021-04-12 01:33:11.664766340 +0200 -@@ -1,5 +1,5 @@ - --include_directories(${SDL2_INCLUDE_DIR}) -+include_directories(${SDL2_INCLUDE_DIRS}) - - add_executable(gst2ascii gst2ascii.c) - -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tools/debugger/gst2ascii.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tools/debugger/gst2ascii.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tools/debugger/gst2ascii.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tools/debugger/gst2ascii.c 2021-04-12 01:33:11.664766340 +0200 -@@ -22,7 +22,7 @@ - # define SDL_SwapBE16(x) x - # define SDL_SwapBE32(x) x - #else --# include -+# include - #endif - #include - #include "../../src/debug/a.out.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tools/hmsa/CMakeLists.txt hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tools/hmsa/CMakeLists.txt ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tools/hmsa/CMakeLists.txt 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tools/hmsa/CMakeLists.txt 2021-04-12 01:33:11.664766340 +0200 -@@ -1,6 +1,6 @@ - - include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src/includes -- ${CMAKE_SOURCE_DIR}/src/debug ${SDL2_INCLUDE_DIR}) -+ ${CMAKE_SOURCE_DIR}/src/debug ${SDL2_INCLUDE_DIRS}) - - set(HMSA_SOURCES hmsa.c floppy.c ../../src/file.c) - -@@ -11,11 +11,7 @@ - - add_executable(hmsa ${HMSA_SOURCES}) - --target_link_libraries(hmsa Floppy) -- --if(MATH_FOUND) -- target_link_libraries(hmsa ${MATH_LIBRARY}) --endif(MATH_FOUND) -+target_link_libraries(hmsa Floppy m) - - if(ZLIB_FOUND) - target_link_libraries(hmsa ${ZLIB_LIBRARY}) -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tools/hmsa/floppy.c hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tools/hmsa/floppy.c ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tools/hmsa/floppy.c 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tools/hmsa/floppy.c 2021-04-12 01:33:11.664766340 +0200 -@@ -8,7 +8,7 @@ - */ - - #include --#include -+#include - - #include "hmsa.h" - #include "floppy.h" -diff -Naur hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tools/hmsa/hmsa.h hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tools/hmsa/hmsa.h ---- hatari-353379e1f8a847cc0e284541d2b40fd49d175d22/tools/hmsa/hmsa.h 2021-03-12 22:36:10.000000000 +0100 -+++ hatari-353379e1f8a847cc0e284541d2b40fd49d175d22.serenity/tools/hmsa/hmsa.h 2021-04-12 01:33:11.664766340 +0200 -@@ -8,7 +8,7 @@ - #ifndef HMSA_H - #define HMSA_H - --#include -+#include - - typedef int BOOL; -