From 30469008de8a3aa5a6aba20fbbdbb65a4767af35 Mon Sep 17 00:00:00 2001 From: TheoryOfNekomata Date: Mon, 20 Feb 2023 12:20:31 +0800 Subject: [PATCH] Migrate SDL to subprojects Remove old SDL dependency. --- CMakeLists.txt | 25 +++++++++------- __mocks__/dependencies/minIni/minIni.mock.h | 30 ------------------- .../SDL}/SDL_events.mock.h | 0 .../SDL}/SDL_joystick.mock.h | 0 .../SDL}/SDL_keyboard.mock.h | 0 .../SDL}/SDL_render.mock.h | 0 .../SDL}/SDL_stdinc.mock.h | 0 src/packages/game/input/input.test.c | 8 ++--- src/packages/game/output/output.test.c | 6 ++-- 9 files changed, 22 insertions(+), 47 deletions(-) delete mode 100644 __mocks__/dependencies/minIni/minIni.mock.h rename __mocks__/{dependencies/SDL2 => subprojects/SDL}/SDL_events.mock.h (100%) rename __mocks__/{dependencies/SDL2 => subprojects/SDL}/SDL_joystick.mock.h (100%) rename __mocks__/{dependencies/SDL2 => subprojects/SDL}/SDL_keyboard.mock.h (100%) rename __mocks__/{dependencies/SDL2 => subprojects/SDL}/SDL_render.mock.h (100%) rename __mocks__/{dependencies/SDL2 => subprojects/SDL}/SDL_stdinc.mock.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c882137..331ffe4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,7 @@ endif() # Specify directories # include_directories( - "${PROJECT_SOURCE_DIR}/dependencies/SDL2/include" + "${PROJECT_SOURCE_DIR}/subprojects/SDL/include" "${PROJECT_SOURCE_DIR}/dependencies/SDL2_image" "${PROJECT_SOURCE_DIR}/dependencies/SDL2_image/include" "${PROJECT_SOURCE_DIR}/dependencies/SDL2_ttf/include" @@ -78,7 +78,7 @@ include_directories( if (IZ_PLATFORM STREQUAL "WINDOWS") link_directories( - "${PROJECT_SOURCE_DIR}/dependencies/SDL2/lib/${IZ_PROJECT_ARCH}" + "${PROJECT_SOURCE_DIR}/subprojects/SDL/build/Release" "${PROJECT_SOURCE_DIR}/dependencies/SDL2_image/lib/${IZ_PROJECT_ARCH}" "${PROJECT_SOURCE_DIR}/dependencies/SDL2_ttf/lib/${IZ_PROJECT_ARCH}" "${PROJECT_SOURCE_DIR}/dependencies/portmidi/Release" @@ -213,10 +213,10 @@ add_executable( subprojects/bdd-for-c-mocks/bdd-for-c-mocks.h __mocks__/subprojects/minIni/minIni.mock.h - __mocks__/dependencies/SDL2/SDL_keyboard.mock.h - __mocks__/dependencies/SDL2/SDL_events.mock.h - __mocks__/dependencies/SDL2/SDL_joystick.mock.h - __mocks__/dependencies/SDL2/SDL_stdinc.mock.h + __mocks__/subprojects/SDL/SDL_keyboard.mock.h + __mocks__/subprojects/SDL/SDL_events.mock.h + __mocks__/subprojects/SDL/SDL_joystick.mock.h + __mocks__/subprojects/SDL/SDL_stdinc.mock.h __mocks__/dependencies/portmidi/portmidi.mock.h src/packages/config/IZ_config.h @@ -255,8 +255,8 @@ add_executable( subprojects/bdd-for-c-mocks/bdd-for-c-mocks.h __mocks__/subprojects/minIni/minIni.mock.h - __mocks__/dependencies/SDL2/SDL_stdinc.mock.h - __mocks__/dependencies/SDL2/SDL_render.mock.h + __mocks__/subprojects/SDL/SDL_stdinc.mock.h + __mocks__/subprojects/SDL/SDL_render.mock.h src/packages/config/IZ_config.h src/packages/game/output/video/IZ_video.h @@ -369,7 +369,7 @@ add_executable( if (IZ_PLATFORM STREQUAL "WINDOWS") add_custom_command(TARGET game POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${PROJECT_SOURCE_DIR}/dependencies/SDL2/lib/${IZ_PROJECT_ARCH}/SDL2.dll" + "${PROJECT_SOURCE_DIR}/subprojects/SDL/build/Release/SDL2.dll" $) add_custom_command(TARGET game POST_BUILD @@ -404,7 +404,7 @@ if (IZ_PLATFORM STREQUAL "WINDOWS") add_custom_command(TARGET server POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${PROJECT_SOURCE_DIR}/dependencies/SDL2/lib/${IZ_PROJECT_ARCH}/SDL2.dll" + "${PROJECT_SOURCE_DIR}/subprojects/SDL/build/Release/SDL2.dll" $) add_custom_command(TARGET server POST_BUILD @@ -421,6 +421,11 @@ if (IZ_PLATFORM STREQUAL "WINDOWS") COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/dependencies/openssl/${IZ_PROJECT_ARCH}/bin/libcrypto-1_1-x64.dll" $) + + add_custom_command(TARGET game-test-input POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${PROJECT_SOURCE_DIR}/subprojects/SDL/build/Release/SDL2.dll" + $) endif () add_custom_command(TARGET game POST_BUILD diff --git a/__mocks__/dependencies/minIni/minIni.mock.h b/__mocks__/dependencies/minIni/minIni.mock.h deleted file mode 100644 index 1df5f06..0000000 --- a/__mocks__/dependencies/minIni/minIni.mock.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef MININI_MOCK_H -#define MININI_MOCK_H - -#include -#include "../../../src/packages/common/IZ_common.h" - -mock(ini_getl) long ini_getl(const char *Section, const char *Key, long DefValue, const char *Filename) { - mock_return(ini_getl) DefValue; -} - -mock(ini_putl) i32 ini_putl(const char *Section, const char *Key, long Value, const char *Filename) { - mock_return(ini_putl) 1; -} - -mock(ini_gets) i32 ini_gets( - const char *Section, - const char *Key, - const char *DefValue, - char *Buffer, - i32 BufferSize, - const char *Filename -) { - mock_return(ini_gets) 0; -} - -mock(ini_puts) i32 ini_puts(const char *Section, const char *Key, const char *Value, const char *Filename) { - mock_return(ini_puts) 1; -} - -#endif diff --git a/__mocks__/dependencies/SDL2/SDL_events.mock.h b/__mocks__/subprojects/SDL/SDL_events.mock.h similarity index 100% rename from __mocks__/dependencies/SDL2/SDL_events.mock.h rename to __mocks__/subprojects/SDL/SDL_events.mock.h diff --git a/__mocks__/dependencies/SDL2/SDL_joystick.mock.h b/__mocks__/subprojects/SDL/SDL_joystick.mock.h similarity index 100% rename from __mocks__/dependencies/SDL2/SDL_joystick.mock.h rename to __mocks__/subprojects/SDL/SDL_joystick.mock.h diff --git a/__mocks__/dependencies/SDL2/SDL_keyboard.mock.h b/__mocks__/subprojects/SDL/SDL_keyboard.mock.h similarity index 100% rename from __mocks__/dependencies/SDL2/SDL_keyboard.mock.h rename to __mocks__/subprojects/SDL/SDL_keyboard.mock.h diff --git a/__mocks__/dependencies/SDL2/SDL_render.mock.h b/__mocks__/subprojects/SDL/SDL_render.mock.h similarity index 100% rename from __mocks__/dependencies/SDL2/SDL_render.mock.h rename to __mocks__/subprojects/SDL/SDL_render.mock.h diff --git a/__mocks__/dependencies/SDL2/SDL_stdinc.mock.h b/__mocks__/subprojects/SDL/SDL_stdinc.mock.h similarity index 100% rename from __mocks__/dependencies/SDL2/SDL_stdinc.mock.h rename to __mocks__/subprojects/SDL/SDL_stdinc.mock.h diff --git a/src/packages/game/input/input.test.c b/src/packages/game/input/input.test.c index af57d77..a2d345a 100644 --- a/src/packages/game/input/input.test.c +++ b/src/packages/game/input/input.test.c @@ -1,8 +1,8 @@ #include -#include "../../../../__mocks__/dependencies/SDL2/SDL_keyboard.mock.h" -#include "../../../../__mocks__/dependencies/SDL2/SDL_joystick.mock.h" -#include "../../../../__mocks__/dependencies/SDL2/SDL_stdinc.mock.h" -#include "../../../../__mocks__/dependencies/minIni/minIni.mock.h" +#include "../../../../__mocks__/subprojects/SDL/SDL_keyboard.mock.h" +#include "../../../../__mocks__/subprojects/SDL/SDL_joystick.mock.h" +#include "../../../../__mocks__/subprojects/SDL/SDL_stdinc.mock.h" +#include "../../../../__mocks__/subprojects/minIni/minIni.mock.h" #include "../../../../__mocks__/dependencies/portmidi/portmidi.mock.h" #include "../../../../__mocks__/src/packages/stdinc/IZ_string.mock.h" #include "../../../../__mocks__/src/packages/stdinc/IZ_stdlib.mock.h" diff --git a/src/packages/game/output/output.test.c b/src/packages/game/output/output.test.c index e354ba0..3020c71 100644 --- a/src/packages/game/output/output.test.c +++ b/src/packages/game/output/output.test.c @@ -1,7 +1,7 @@ #include -#include "../../../../__mocks__/dependencies/minIni/minIni.mock.h" -#include "../../../../__mocks__/dependencies/SDL2/SDL_stdinc.mock.h" -#include "../../../../__mocks__/dependencies/SDL2/SDL_render.mock.h" +#include "../../../../__mocks__/subprojects/minIni/minIni.mock.h" +#include "../../../../__mocks__/subprojects/SDL/SDL_stdinc.mock.h" +#include "../../../../__mocks__/subprojects/SDL/SDL_render.mock.h" #include "video/IZ_video.h" const char* IZ_ConfigGetCommandlineOption(u8 argc, const char* argv[], const char* val) {