diff --git a/.gitmodules b/.gitmodules index 88296da1..2539f20c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -[submodule "dependencies"] - path = dependencies - url = https://github.com/visualboyadvance-m/dependencies.git +[submodule "win32-deps"] + path = win32-deps + url = https://github.com/visualboyadvance-m/win32-deps.git branch = master diff --git a/CMakeLists.txt b/CMakeLists.txt index c4720f06..2416cede 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,7 @@ if(GIT_FOUND AND WIN32) # Win32 deps submodule set(SUBMODULE_MANUAL_UPDATE FALSE) - if(EXISTS "${CMAKE_SOURCE_DIR}/.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include") + if(EXISTS "${CMAKE_SOURCE_DIR}/.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/win32-deps/mingw-xaudio/include") set(SUBMODULE_MANUAL_UPDATE TRUE) execute_process( COMMAND "${GIT_EXECUTABLE}" submodule update --init --remote --recursive @@ -61,7 +61,7 @@ if(GIT_FOUND AND WIN32) ) endif() - if(NOT EXISTS "${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include") + if(NOT EXISTS "${CMAKE_SOURCE_DIR}/win32-deps/mingw-xaudio/include") if(NOT (SUBMODULE_MANUAL_UPDATE AND SUBMODULE_UPDATE_STATUS EQUAL 0)) message(FATAL_ERROR "Please pull in git submodules, e.g.\nrun: git submodule update --init --remote --recursive") endif() @@ -191,5 +191,5 @@ set(CPACK_SOURCE_GENERATOR "TGZ") set(CPACK_PACKAGE_VERSION_MAJOR "2") set(CPACK_PACKAGE_VERSION_MINOR "0") set(CPACK_PACKAGE_VERSION_PATCH "0-Git-${COMMITHASH}") -list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/dependencies") +list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/win32-deps") include(CPack) diff --git a/cmake/Toolchain-mingw.cmake b/cmake/Toolchain-mingw.cmake index ee0195a1..740e616f 100644 --- a/cmake/Toolchain-mingw.cmake +++ b/cmake/Toolchain-mingw.cmake @@ -3,8 +3,8 @@ if (NOT MINGW) endif() # this has to run after the toolchain is initialized. -include_directories("${CMAKE_SOURCE_DIR}/dependencies/mingw-include") -include_directories("${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include") +include_directories("${CMAKE_SOURCE_DIR}/win32-deps/mingw-include") +include_directories("${CMAKE_SOURCE_DIR}/win32-deps/mingw-xaudio/include") # Add Winsock as the last library linked because of broken link precedence. set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -lws2_32") diff --git a/cmake/Toolchain-msvc.cmake b/cmake/Toolchain-msvc.cmake index 7259460b..c2f39ab1 100644 --- a/cmake/Toolchain-msvc.cmake +++ b/cmake/Toolchain-msvc.cmake @@ -10,7 +10,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") endif() endif() -include_directories("${CMAKE_SOURCE_DIR}/dependencies/msvc") +include_directories("${CMAKE_SOURCE_DIR}/win32-deps/msvc") add_compile_definitions( _FORCENAMELESSUNION diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt index 4ec31edc..7c077918 100644 --- a/src/sdl/CMakeLists.txt +++ b/src/sdl/CMakeLists.txt @@ -31,8 +31,8 @@ if(MSVC) # We should probably use an external library for this. target_sources(vbam PRIVATE - ${CMAKE_SOURCE_DIR}/dependencies/msvc/getopt.c - ${CMAKE_SOURCE_DIR}/dependencies/msvc/getopt.h + ${CMAKE_SOURCE_DIR}/win32-deps/msvc/getopt.c + ${CMAKE_SOURCE_DIR}/win32-deps/msvc/getopt.h ) endif() diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt index 7f0fbf7e..1913f995 100644 --- a/src/wx/CMakeLists.txt +++ b/src/wx/CMakeLists.txt @@ -519,7 +519,7 @@ host_compile(${CMAKE_CURRENT_SOURCE_DIR}/bin2c.c ${BIN2C}) # Override wxrc when cross-compiling. if(CMAKE_HOST_WIN32 AND CMAKE_CROSSCOMPILING) - set(WXRC ${CMAKE_SOURCE_DIR}/dependencies/wxrc/wxrc.exe) + set(WXRC ${CMAKE_SOURCE_DIR}/win32-deps/wxrc/wxrc.exe) endif() # Configure wxrc. @@ -666,7 +666,7 @@ endif() if(WIN32 AND (X86_64 OR ARM64 OR X86_32) AND ENABLE_ONLINEUPDATES) if(NOT DEFINED WINSPARKLE_BIN_RELEASE_DIR) - set(WINSPARKLE_BIN_RELEASE_DIR ${CMAKE_SOURCE_DIR}/dependencies/WinSparkle-0.8.1) + set(WINSPARKLE_BIN_RELEASE_DIR ${CMAKE_SOURCE_DIR}/win32-deps/WinSparkle-0.8.1) endif() target_include_directories( diff --git a/dependencies b/win32-deps similarity index 100% rename from dependencies rename to win32-deps