Skip to content

Commit

Permalink
Bump version of SpecUtils, and some small fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
wcjohns committed Sep 9, 2024
1 parent eba97ed commit ba5b9d5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,11 @@ target_compile_options(InterSpecLib PRIVATE
-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]
$<$<CXX_COMPILER_ID:MSVC>:
>)

# Turn off "note: The practice of declaring the Bind placeholders (_1, _2, ...) in the global namespace is deprecated...."
# warnings (these come from Wt I think, not our code)
target_compile_definitions(InterSpecLib PUBLIC -D BOOST_BIND_GLOBAL_PLACEHOLDERS)

if(WIN32)
#0x0601==Win7, 0x0501=WinXP (Wt CMakeLists.txt uses 0x0501x)
target_compile_definitions( InterSpecLib PUBLIC /bigobj -D _WIN32_WINNT=0x0601 -D WINVER=0x0601 -D _SCL_SECURE_NO_WARNINGS )
Expand Down
5 changes: 4 additions & 1 deletion InterSpec/InterSpec_config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,10 @@ void log_developer_error( const char *location, const char *error );

#define InterSpec_PHONE_ROTATE_FOR_TABS 1

#if ( defined(WIN32) || defined(UNDER_CE) || defined(_WIN32) || defined(WIN64) )
// On Windows, we will compile LibInterSpec as a shared DLL only when
// `USE_BATCH_TOOLS` is enabled - so in this case we need to export the functions
// we will want to use from the DLL.
#if( USE_BATCH_TOOLS && (defined(WIN32) || defined(UNDER_CE) || defined(_WIN32) || defined(WIN64)) )
#ifdef InterSpec_EXPORTS
#define InterSpec_API __declspec(dllexport)
#else
Expand Down
2 changes: 1 addition & 1 deletion external_libs/SpecUtils

0 comments on commit ba5b9d5

Please sign in to comment.