Skip to content

Commit c8770ec

Browse files
committed
-
1 parent 51c03b9 commit c8770ec

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

CMakeLists.txt

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ FOREACH(LINKTYPE ${LINKTYPES})
4747
SET_TARGET_PROPERTIES(dirtrav_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "DIRTRAV_GENERATE;${LINKTYPE};${FORCE_OPENDIR_DEF}")
4848
SET_TARGET_PROPERTIES(dirtrav_${LINKTYPE} PROPERTIES OUTPUT_NAME dirtrav)
4949
TARGET_INCLUDE_DIRECTORIES(dirtrav_${LINKTYPE} PRIVATE lib)
50-
#TARGET_LINK_LIBRARIES(dirtrav_${LINKTYPE} ${ANYZIP_LIBRARIES} ${EXPAT_LIBRARIES})
50+
IF(WIN32 AND "${LINKTYPE}" STREQUAL "SHARED")
51+
TARGET_LINK_LIBRARIES(dirtrav_${LINKTYPE} -lmpr -lshlwapi)
52+
ENDIF()
5153
SET(ALLTARGETS ${ALLTARGETS} dirtrav_${LINKTYPE})
5254

5355
IF(WITH_WIDE)
@@ -56,24 +58,32 @@ FOREACH(LINKTYPE ${LINKTYPES})
5658
SET_TARGET_PROPERTIES(dirtravw_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "DIRTRAV_GENERATE_WIDE;${LINKTYPE};${FORCE_OPENDIR_DEF}")
5759
SET_TARGET_PROPERTIES(dirtravw_${LINKTYPE} PROPERTIES OUTPUT_NAME dirtravw)
5860
TARGET_INCLUDE_DIRECTORIES(dirtravw_${LINKTYPE} PRIVATE lib)
59-
#TARGET_LINK_LIBRARIES(dirtravw_${LINKTYPE} ${ANYZIP_LIBRARIES} ${EXPATW_LIBRARIES})
61+
IF(WIN32 AND "${LINKTYPE}" STREQUAL "SHARED")
62+
TARGET_LINK_LIBRARIES(dirtravw_${LINKTYPE} -lmpr -lshlwapi)
63+
ENDIF()
6064
SET(ALLTARGETS ${ALLTARGETS} dirtravw_${LINKTYPE})
6165
ENDIF()
6266

6367
SET(EXELINKTYPE ${LINKTYPE})
6468
ENDFOREACH()
6569

6670
IF(BUILD_TOOLS)
71+
IF(WIN32 AND "${EXELINKTYPE}" STREQUAL "STATIC")
72+
SET(TOOLS_LIBS -lmpr -lshlwapi)
73+
ELSE()
74+
SET(TOOLS_LIBS)
75+
ENDIF()
76+
6777
ADD_EXECUTABLE(tree src/tree.c)
68-
TARGET_LINK_LIBRARIES(tree dirtrav_${EXELINKTYPE})
78+
TARGET_LINK_LIBRARIES(tree dirtrav_${EXELINKTYPE} ${TOOLS_LIBS})
6979
LIST(APPEND ALLTARGETS tree)
7080

7181
ADD_EXECUTABLE(rdir src/rdir.c)
72-
TARGET_LINK_LIBRARIES(rdir dirtrav_${EXELINKTYPE})
82+
TARGET_LINK_LIBRARIES(rdir dirtrav_${EXELINKTYPE} ${TOOLS_LIBS})
7383
LIST(APPEND ALLTARGETS rdir)
7484

7585
ADD_EXECUTABLE(folderstats src/folderstats.c)
76-
TARGET_LINK_LIBRARIES(folderstats dirtrav_${EXELINKTYPE})
86+
TARGET_LINK_LIBRARIES(folderstats dirtrav_${EXELINKTYPE} ${TOOLS_LIBS})
7787
LIST(APPEND ALLTARGETS folderstats)
7888
ENDIF()
7989

Changelog.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
0.2.23
2+
3+
2025-11-04 Brecht Sanders https://github.com/brechtsanders/
4+
5+
* fix CMakeLists.txt
6+
17
0.2.22
28

39
2025-11-04 Brecht Sanders https://github.com/brechtsanders/
410

511
* additional argument added to dirtrav_userid_to_name()
6-
* added dirtravw_prop_get_remote_server() and dirtravw_get_remote_server_from_path()
12+
* added dirtrav_prop_get_remote_server() and dirtrav_get_remote_server_from_path()
713

814
0.2.21
915

include/dirtrav_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ THE SOFTWARE.
4747
/*! \brief minor version number */
4848
#define DIRTRAV_VERSION_MINOR 2
4949
/*! \brief micro version number */
50-
#define DIRTRAV_VERSION_MICRO 22
50+
#define DIRTRAV_VERSION_MICRO 23
5151
/*! @} */
5252

5353
/*! \cond PRIVATE */

0 commit comments

Comments
 (0)