dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build/windows: Move Windows .pdb utility to tools/

Browse source 
This reverts 63f5ea9d regarding the file naming

Since the script is an utility pretty much one-task, it suits better on tools,
similarly to what we do on babl and meson (but on these we put on root).
And, along with 8c0f92b3, it makes build/windows less scary with less files.
This commit is contained in:
Bruno Lopes 2025-12-26 19:15:15 -03:00
parent 631ab87557
commit 381ea0c6d2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/windows/1_build-deps-msys2.ps1
View file

@ -135,7 +135,7 @@ function self_build ([string]$repo, [array]$branch, [array]$patches, [array]$opt
{
if ("$dep" -ne 'babl' -and "$dep" -ne 'gegl')
{
Add-Content meson.build "meson.add_install_script(find_program('$("$GIMP_DIR".Replace('\','/'))/build/windows/2_bundle-gimp-uni_sym.py'))"
Add-Content meson.build "meson.add_install_script(find_program('$("$GIMP_DIR".Replace('\','/'))/tools/meson_install_win_debug.py'))"
}
$clang_opts_meson=@('-Dc_args=-"fansi-escape-codes -gcodeview"', '-Dcpp_args=-"fansi-escape-codes -gcodeview"', '-Dc_link_args="-Wl,--pdb="', '-Dcpp_link_args="-Wl,--pdb="')
}
@ -147,7 +147,7 @@ function self_build ([string]$repo, [array]$branch, [array]$patches, [array]$opt
{
if (-not "$env:VCPKG_ROOT" -and "$env:MSYSTEM_PREFIX" -ne 'MINGW32')
{
Add-Content CMakeLists.txt "install(CODE `"execute_process(COMMAND `${Python3_EXECUTABLE`} $("$GIMP_DIR".Replace('\','/'))/build/windows/2_bundle-gimp-uni_sym.py`)`")"
Add-Content CMakeLists.txt "install(CODE `"execute_process(COMMAND `${Python3_EXECUTABLE`} $("$GIMP_DIR".Replace('\','/'))/tools/meson_install_win_debug.py`)`")"
$clang_opts_cmake=@('-DCMAKE_C_FLAGS="-gcodeview"', '-DCMAKE_CXX_FLAGS="-gcodeview"', '-DCMAKE_EXE_LINKER_FLAGS="-Wl,--pdb="', '-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--pdb="', '-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--pdb="')
}
cmake -G Ninja -B _build-$(@($env:VCPKG_DEFAULT_TRIPLET,$env:MSYSTEM_PREFIX) | ?{$_} | select -First 1) -DCMAKE_INSTALL_PREFIX="$GIMP_PREFIX" `

4
meson.build
View file

@ -203,7 +203,7 @@ if platform_windows
if cc.get_argument_syntax() == 'msvc'
# MSVC's rc.exe style: /DKey=Value'
rc_define_flag = []
rc_define_flag = []
rc_define_fmt = '/D@0@=@1@'
else
# GNU's windres.exe style: --define Key="Value"
@ -2052,7 +2052,7 @@ pkgconfig.generate(libgimpui,
# Ideally meson should take care of it automatically.
# See: https://github.com/mesonbuild/meson/issues/12977
if platform_windows and debugging_format == 'native' and cc.get_argument_syntax() != 'msvc'
install_win_debug_script = find_program('build/windows/2_bundle-gimp-uni_sym.py')
install_win_debug_script = find_program('tools/meson_install_win_debug.py')
meson.add_install_script(install_win_debug_script)
endif

0
build/windows/2_bundle-gimp-uni_sym.py → tools/meson_install_win_debug.py
View file