Skip to content

Commit af4eabe

Browse files
committed
[acquire/acquire_miniz.h] Newly namespaced header (thanks vcpkg) ; [acquire/tests/CMakeLists.txt] Add LIBACQUIRE_DOWNLOAD_DIR_IMPL ; [acquire/acquire_net_common.h] get_download_dir guarded by LIBACQUIRE_DOWNLOAD_DIR_IMPL
1 parent 5e68372 commit af4eabe

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

acquire/acquire_miniz.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <stdio.h>
77
#include <stdlib.h>
88

9-
#include <kubazip/zip.h>
9+
#include <kubazip/zip/zip.h>
1010

1111
#include "acquire_extract.h"
1212
#include "acquire_fileutils.h"

acquire/acquire_net_common.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ bool is_downloaded(const char *url_or_path, enum Checksum checksum,
7979
}
8080

8181
/* fallback */
82-
static const char *get_download_dir(void) { return ".fallback_downloads"; }
82+
#ifdef LIBACQUIRE_DOWNLOAD_DIR_IMPL
83+
const char *get_download_dir(void) { return ".fallback_downloads"; }
84+
#endif /* LIBACQUIRE_DOWNLOAD_DIR_IMPL */
8385

8486
#endif /* defined(LIBACQUIRE_IMPLEMENTATION) && \
8587
defined(LIBACQUIRE_ACQUIRE_NET_COMMON_IMPL) */

acquire/tests/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ source_group("${DOWNLOAD_DIR_LIB} Source Files" FILES "${Source_Files}")
136136

137137
add_library("${DOWNLOAD_DIR_LIB}" SHARED "${Header_Files}" "${Source_Files}")
138138

139+
set_source_files_properties(
140+
"${CMAKE_BINARY_DIR}/gen/gen_acquire_net_common.c" PROPERTIES
141+
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;LIBACQUIRE_DOWNLOAD_DIR_IMPL=1"
142+
)
139143
target_link_libraries("${DOWNLOAD_DIR_LIB}" PRIVATE "${PROJECT_NAME}")
140144

141145
target_include_directories(

0 commit comments

Comments
 (0)