From fa1558319bbce195324fe4123f5a941cad9cafd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Zumer?= Date: Sat, 21 Mar 2020 18:35:43 -0400 Subject: [PATCH 1/5] Disable CI on non-master branches --- .github/workflows/build-ubuntu.yml | 8 +++++++- .github/workflows/build-windows.yml | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index fed0f3e2..b57c5b75 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -1,6 +1,12 @@ name: CMake Build (Ubuntu x86-64) -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: + branches: + - master env: BUILD_TYPE: Release diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index c7d05d03..ec14e30a 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -1,6 +1,12 @@ name: CMake Build (Windows x86-64) -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: + branches: + - master env: BUILD_TYPE: Release From a6150a9a9eaab7431b62a527f538c570ab8a6990 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Sun, 12 Apr 2020 16:59:06 +0200 Subject: [PATCH 2/5] Use pkg-config to find SDL2 on Windows --- src/libui_sdl/CMakeLists.txt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/libui_sdl/CMakeLists.txt b/src/libui_sdl/CMakeLists.txt index 8c8467bd..bcecc818 100644 --- a/src/libui_sdl/CMakeLists.txt +++ b/src/libui_sdl/CMakeLists.txt @@ -22,13 +22,12 @@ option(BUILD_SHARED_LIBS "Whether to build libui as a shared library or a static set(BUILD_SHARED_LIBS OFF) add_subdirectory(libui) -find_package(SDL2 REQUIRED) -include_directories(${SDL2_INCLUDE_DIR}) -#string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES) +find_package(PkgConfig REQUIRED) +pkg_check_modules(SDL2 REQUIRED sdl2) add_executable(melonDS ${SOURCES_LIBUI}) -target_link_libraries(melonDS - core ${SDL2_LIBRARIES} libui) +target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS}) +target_link_libraries(melonDS core libui ${SDL2_LIBRARIES}) if (UNIX) option(UNIX_PORTABLE "Make a portable build that looks for its configuration in the current directory" OFF) @@ -38,12 +37,9 @@ if (UNIX) find_package(PkgConfig REQUIRED) pkg_check_modules(GTK3 REQUIRED gtk+-3.0) - pkg_check_modules(SDL2 REQUIRED sdl2) - target_include_directories(melonDS - PRIVATE ${GTK3_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS} - ) - target_link_libraries(melonDS ${GTK3_LIBRARIES} ${SDL2_LIBRARIES}) + target_include_directories(melonDS PRIVATE ${GTK3_INCLUDE_DIRS}) + target_link_libraries(melonDS ${GTK3_LIBRARIES}) ADD_DEFINITIONS(${GTK3_CFLAGS_OTHER}) From 4b57416552ec2fa95216e2b044559f215723bf70 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Sun, 12 Apr 2020 17:15:39 +0200 Subject: [PATCH 3/5] Windows: explicitly link gdi32 --- src/libui_sdl/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libui_sdl/CMakeLists.txt b/src/libui_sdl/CMakeLists.txt index bcecc818..a3a7f8a9 100644 --- a/src/libui_sdl/CMakeLists.txt +++ b/src/libui_sdl/CMakeLists.txt @@ -59,7 +59,7 @@ if (UNIX) elseif (WIN32) target_sources(melonDS PUBLIC "${CMAKE_SOURCE_DIR}/melon.rc") target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..") - target_link_libraries(melonDS comctl32 d2d1 dwrite uxtheme ws2_32 iphlpapi) + target_link_libraries(melonDS comctl32 d2d1 dwrite uxtheme ws2_32 iphlpapi gdi32) endif () install(FILES ../../net.kuribo64.melonDS.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) From 07012575460d27ffa9def84b594f728607c4a70c Mon Sep 17 00:00:00 2001 From: Arisotura Date: Tue, 14 Apr 2020 23:32:47 +0200 Subject: [PATCH 4/5] add credit for the icon --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cf0afed2..a34b7ea4 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,7 @@ If everything went well, melonDS and the libraries it needs should now be in the * Martin for GBAtek, a good piece of documentation * Cydrak for the extra 3D GPU research + * limittox for the icon * All of you comrades who have been testing melonDS, reporting issues, suggesting shit, etc ## License From 5ef71181c891aceec9db7297d1642b0e70e98911 Mon Sep 17 00:00:00 2001 From: Arisotura Date: Sat, 25 Apr 2020 15:04:46 +0200 Subject: [PATCH 5/5] goodbye old CodeBlocks project --- melonDS.cbp | 292 ---------------------------------------------------- 1 file changed, 292 deletions(-) delete mode 100644 melonDS.cbp diff --git a/melonDS.cbp b/melonDS.cbp deleted file mode 100644 index 8d900d1f..00000000 --- a/melonDS.cbp +++ /dev/null @@ -1,292 +0,0 @@ - - - - - -