Skip to content

Commit ba5b9d5

Browse files
committed
Bump version of SpecUtils, and some small fixes.
1 parent eba97ed commit ba5b9d5

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,11 @@ target_compile_options(InterSpecLib PRIVATE
633633
-Wno-inconsistent-missing-override> # Turn off a bunch of warnings like: WTreeView:399:20: warning: 'headerWidget' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
634634
$<$<CXX_COMPILER_ID:MSVC>:
635635
>)
636+
637+
# Turn off "note: The practice of declaring the Bind placeholders (_1, _2, ...) in the global namespace is deprecated...."
638+
# warnings (these come from Wt I think, not our code)
639+
target_compile_definitions(InterSpecLib PUBLIC -D BOOST_BIND_GLOBAL_PLACEHOLDERS)
640+
636641
if(WIN32)
637642
#0x0601==Win7, 0x0501=WinXP (Wt CMakeLists.txt uses 0x0501x)
638643
target_compile_definitions( InterSpecLib PUBLIC /bigobj -D _WIN32_WINNT=0x0601 -D WINVER=0x0601 -D _SCL_SECURE_NO_WARNINGS )

InterSpec/InterSpec_config.h.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,10 @@ void log_developer_error( const char *location, const char *error );
120120

121121
#define InterSpec_PHONE_ROTATE_FOR_TABS 1
122122

123-
#if ( defined(WIN32) || defined(UNDER_CE) || defined(_WIN32) || defined(WIN64) )
123+
// On Windows, we will compile LibInterSpec as a shared DLL only when
124+
// `USE_BATCH_TOOLS` is enabled - so in this case we need to export the functions
125+
// we will want to use from the DLL.
126+
#if( USE_BATCH_TOOLS && (defined(WIN32) || defined(UNDER_CE) || defined(_WIN32) || defined(WIN64)) )
124127
#ifdef InterSpec_EXPORTS
125128
#define InterSpec_API __declspec(dllexport)
126129
#else

external_libs/SpecUtils

0 commit comments

Comments
 (0)