build: rename dependencies submodule -> win32-deps

Rename the Git submodule `dependencies` used for some dependent files
for Win32 builds to `win32-deps` and make the necessary adjustments to
the CMake code.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2024-10-04 20:05:52 +00:00
parent 4f8d0a8867
commit cdfd37fc4e
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
7 changed files with 13 additions and 13 deletions

6
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "dependencies"] [submodule "win32-deps"]
path = dependencies path = win32-deps
url = https://github.com/visualboyadvance-m/dependencies.git url = https://github.com/visualboyadvance-m/win32-deps.git
branch = master branch = master

View File

@ -52,7 +52,7 @@ if(GIT_FOUND AND WIN32)
# Win32 deps submodule # Win32 deps submodule
set(SUBMODULE_MANUAL_UPDATE FALSE) 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) set(SUBMODULE_MANUAL_UPDATE TRUE)
execute_process( execute_process(
COMMAND "${GIT_EXECUTABLE}" submodule update --init --remote --recursive COMMAND "${GIT_EXECUTABLE}" submodule update --init --remote --recursive
@ -61,7 +61,7 @@ if(GIT_FOUND AND WIN32)
) )
endif() 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)) 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") message(FATAL_ERROR "Please pull in git submodules, e.g.\nrun: git submodule update --init --remote --recursive")
endif() endif()
@ -191,5 +191,5 @@ set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_PACKAGE_VERSION_MAJOR "2") set(CPACK_PACKAGE_VERSION_MAJOR "2")
set(CPACK_PACKAGE_VERSION_MINOR "0") set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION_PATCH "0-Git-${COMMITHASH}") 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) include(CPack)

View File

@ -3,8 +3,8 @@ if (NOT MINGW)
endif() endif()
# this has to run after the toolchain is initialized. # this has to run after the toolchain is initialized.
include_directories("${CMAKE_SOURCE_DIR}/dependencies/mingw-include") include_directories("${CMAKE_SOURCE_DIR}/win32-deps/mingw-include")
include_directories("${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include") include_directories("${CMAKE_SOURCE_DIR}/win32-deps/mingw-xaudio/include")
# Add Winsock as the last library linked because of broken link precedence. # Add Winsock as the last library linked because of broken link precedence.
set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -lws2_32") set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -lws2_32")

View File

@ -10,7 +10,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
endif() endif()
endif() endif()
include_directories("${CMAKE_SOURCE_DIR}/dependencies/msvc") include_directories("${CMAKE_SOURCE_DIR}/win32-deps/msvc")
add_compile_definitions( add_compile_definitions(
_FORCENAMELESSUNION _FORCENAMELESSUNION

View File

@ -31,8 +31,8 @@ if(MSVC)
# We should probably use an external library for this. # We should probably use an external library for this.
target_sources(vbam target_sources(vbam
PRIVATE PRIVATE
${CMAKE_SOURCE_DIR}/dependencies/msvc/getopt.c ${CMAKE_SOURCE_DIR}/win32-deps/msvc/getopt.c
${CMAKE_SOURCE_DIR}/dependencies/msvc/getopt.h ${CMAKE_SOURCE_DIR}/win32-deps/msvc/getopt.h
) )
endif() endif()

View File

@ -519,7 +519,7 @@ host_compile(${CMAKE_CURRENT_SOURCE_DIR}/bin2c.c ${BIN2C})
# Override wxrc when cross-compiling. # Override wxrc when cross-compiling.
if(CMAKE_HOST_WIN32 AND CMAKE_CROSSCOMPILING) 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() endif()
# Configure wxrc. # Configure wxrc.
@ -666,7 +666,7 @@ endif()
if(WIN32 AND (X86_64 OR ARM64 OR X86_32) AND ENABLE_ONLINEUPDATES) if(WIN32 AND (X86_64 OR ARM64 OR X86_32) AND ENABLE_ONLINEUPDATES)
if(NOT DEFINED WINSPARKLE_BIN_RELEASE_DIR) 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() endif()
target_include_directories( target_include_directories(