Skip to content

[Build] Complete the loadlib relocation out of dep/ - #3

Merged
billy1arm merged 1 commit into
mangosfour:masterfrom
r-log:fix/complete-loadlib-relocation
Jun 30, 2026
Merged

[Build] Complete the loadlib relocation out of dep/#3
billy1arm merged 1 commit into
mangosfour:masterfrom
r-log:fix/complete-loadlib-relocation

Conversation

@r-log

@r-log r-log commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

The earlier "move loadlib out of dep/" change landed the file move but not the build wiring, so master currently can't configure or compile the extractors:

  • dep/CMakeLists.txt still ran add_subdirectory(loadlib) for the now-removed dep/loadlib/, so CMake configure errors out.
  • src/tools/Extractor_projects/CMakeLists.txt was missing the add_subdirectory(loadlib) that defines the relocated target — so all three extractors linked an undefined loadlib (no StormLib include propagation).
  • Four includes still pointed at the old ../loadlib/sl/X.h path (map-extractor/System.cpp ×2, map-extractor/dbcfile.cpp, shared/ExtractorCommon.h).

This completes the relocation:

  • drop the dangling dep/ add_subdirectory(loadlib)
  • add add_subdirectory(loadlib) in the extractor tree
  • fix the four ../loadlib/sl/X.h../loadlib/X.h includes
  • refresh a stale dep/loadlib/sl/adt.h reference in a GridMap comment

Verified: map-extractor, vmap-extractor, and mmap-extractor all build green again (MSVC, Release).


This change is Reviewable

The earlier move of the loadlib reader out of dep/ landed the file move
but not the build wiring, leaving the tree unable to configure or compile
the extractors (the loadlib target was never defined and stale include
paths pointed at the removed dep/loadlib/sl/ location).

- dep/CMakeLists.txt: drop the dangling add_subdirectory(loadlib) (the
  directory no longer lives under dep/)
- src/tools/Extractor_projects/CMakeLists.txt: add_subdirectory(loadlib)
  so the relocated target is actually built
- fix four stale includes ../loadlib/sl/X.h -> ../loadlib/X.h
  (map-extractor System.cpp x2, dbcfile.cpp, shared/ExtractorCommon.h)
- update the now-stale dep/loadlib/sl/adt.h reference in a GridMap comment

map-extractor, vmap-extractor and mmap-extractor all build again.
@billy1arm
billy1arm merged commit 59cfb07 into mangosfour:master Jun 30, 2026
@r-log
r-log deleted the fix/complete-loadlib-relocation branch July 5, 2026 14:47
H0zen added a commit to H0zen/mangos_four that referenced this pull request Aug 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants