Skip to content

[pull] master from ladislav-zezula:master #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Mar 5, 2026
Merged

[pull] master from ladislav-zezula:master #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2eeaff
Add SFileAddListFileEntries to exports
TheNitesWhoSay Mar 5, 2026
720941a
Update auto link variable name in cmake to match new name
TheNitesWhoSay Mar 5, 2026
570734e
Merge pull request #422 from TheNitesWhoSay/master
ladislav-zezula Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ endif()

target_link_libraries(${LIBRARY_NAME} ${LINK_LIBS})
add_library(${PROJECT_NAME}::${LIBRARY_NAME} ALIAS ${LIBRARY_NAME}) # Allow users to link StormLib::storm when using add_subdirectory
target_compile_definitions(${LIBRARY_NAME} INTERFACE STORMLIB_NO_AUTO_LINK) #CMake will take care of the linking
target_compile_definitions(${LIBRARY_NAME} INTERFACE __STORMLIB_NO_STATIC_LINK__) #CMake will take care of the linking
target_include_directories(${LIBRARY_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>)
set_target_properties(${LIBRARY_NAME} PROPERTIES PUBLIC_HEADER "src/StormLib.h;src/StormPort.h")
if(BUILD_SHARED_LIBS)
Expand Down
1 change: 1 addition & 0 deletions src/DllMain.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ EXPORTS
SFileCloseArchive

SFileAddListFile
SFileAddListFileEntries

SFileSetCompactCallback
SFileCompactArchive
Expand Down
1 change: 1 addition & 0 deletions src/StormLib.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ _SFileFlushArchive
_SFileCloseArchive

_SFileAddListFile
_SFileAddListFileEntries

_SFileSetCompactCallback
_SFileCompactArchive
Expand Down