diff --git a/exhale_vs2012.sln b/exhale_vs2012.sln index 34390fc..150e0a8 100644 --- a/exhale_vs2012.sln +++ b/exhale_vs2012.sln @@ -37,10 +37,10 @@ Global {EC0D1502-2018-1700-4865-6C6D72696368}.Release|Win32.Build.0 = Release|Win32 {EC0D1502-2018-1700-4865-6C6D72696368}.Release|x64.ActiveCfg = Release|x64 {EC0D1502-2018-1700-4865-6C6D72696368}.Release|x64.Build.0 = Release|x64 - {EC0D1502-2018-1700-4865-6C6D72696368}.Release DLL|Win32.ActiveCfg = Release|Win32 - {EC0D1502-2018-1700-4865-6C6D72696368}.Release DLL|Win32.Build.0 = Release|Win32 - {EC0D1502-2018-1700-4865-6C6D72696368}.Release DLL|x64.ActiveCfg = Release|x64 - {EC0D1502-2018-1700-4865-6C6D72696368}.Release DLL|x64.Build.0 = Release|x64 + {EC0D1502-2018-1700-4865-6C6D72696368}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 + {EC0D1502-2018-1700-4865-6C6D72696368}.Release DLL|Win32.Build.0 = Release DLL|Win32 + {EC0D1502-2018-1700-4865-6C6D72696368}.Release DLL|x64.ActiveCfg = Release DLL|x64 + {EC0D1502-2018-1700-4865-6C6D72696368}.Release DLL|x64.Build.0 = Release DLL|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/include/exhaleDecl.h b/include/exhaleDecl.h index ef9b3bc..2fa382b 100644 --- a/include/exhaleDecl.h +++ b/include/exhaleDecl.h @@ -12,7 +12,9 @@ #define _EXHALE_DECL_H_ #include /* for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t */ +#if !defined(_MSC_VER) || _MSC_VER >= 1800 #include +#endif #if defined (_WIN32) || defined (WIN32) || defined (_WIN64) || defined (WIN64) # ifdef EXHALE_DYN_LINK diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 1ebe9b8..939d3a6 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -33,6 +33,9 @@ if(CMAKE_DL_LIBS) endif() target_link_libraries(exhaleApp PRIVATE exhaleLib) target_include_directories(exhaleApp PRIVATE ${PROJECT_SOURCE_DIR}/include) +if(BUILD_SHARED_LIBS) + target_compile_definitions(exhaleApp PRIVATE USE_EXHALELIB_DLL) +endif(BUILD_SHARED_LIBS) # PCH requires at least 3.16 # I actually don't know if this works or not diff --git a/src/app/exhaleApp.rc b/src/app/exhaleApp.rc index 1126552..b2cca4a 100644 --- a/src/app/exhaleApp.rc +++ b/src/app/exhaleApp.rc @@ -8,12 +8,12 @@ * Copyright (c) 2018-2021 Christian R. Helmrich, project ecodis. All rights reserved. */ -#include "..\..\include\version.h" // for EXHALELIB_VERSION_... strings +#include "../../include/version.h" // for EXHALELIB_VERSION_... strings #include 0 ICON "exhaleApp.ico" VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,1,9 +FILEVERSION 1,1,9,1 BEGIN BLOCK "StringFileInfo" BEGIN diff --git a/src/app/exhaleApp_vs2012.vcxproj b/src/app/exhaleApp_vs2012.vcxproj index 78ec24c..fb42fd8 100644 --- a/src/app/exhaleApp_vs2012.vcxproj +++ b/src/app/exhaleApp_vs2012.vcxproj @@ -17,6 +17,14 @@ Release x64 + + Release DLL + Win32 + + + Release DLL + x64 + {EC0D1502-2018-1700-4865-6C6D72696368} @@ -40,12 +48,24 @@ false true + + Application + v110 + false + true + Application v110 false true + + Application + v110 + false + true + @@ -57,9 +77,15 @@ + + + + + + $(SolutionDir)build\$(PlatformToolset)\$(Platform)\$(Configuration)\ @@ -75,12 +101,24 @@ $(SolutionDir)bin\$(PlatformToolset)\$(Platform)\$(Configuration)\ exhale + + false + $(SolutionDir)build\$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(PlatformToolset)\$(Platform)\$(Configuration)\ + exhale + false $(SolutionDir)build\$(PlatformToolset)\$(Platform)\$(Configuration)\ $(SolutionDir)bin\$(PlatformToolset)\$(Platform)\$(Configuration)\ exhale + + false + $(SolutionDir)build\$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(PlatformToolset)\$(Platform)\$(Configuration)\ + exhale + $(SolutionDir)include @@ -133,6 +171,26 @@ Console + + + $(SolutionDir)include + true + true + MaxSpeed + Use + exhaleAppPch.h + WIN32;NDEBUG;_CONSOLE;USE_EXHALELIB_DLL;%(PreprocessorDefinitions) + true + Level3 + + + $(SolutionDir)lib\$(PlatformToolset)\$(Platform)\$(Configuration)\ + true + false + true + Console + + $(SolutionDir)include @@ -153,6 +211,26 @@ Console + + + $(SolutionDir)include + true + true + MaxSpeed + Use + exhaleAppPch.h + WIN32;NDEBUG;_CONSOLE;USE_EXHALELIB_DLL;%(PreprocessorDefinitions) + true + Level3 + + + $(SolutionDir)lib\$(PlatformToolset)\$(Platform)\$(Configuration)\ + true + false + true + Console + + @@ -169,7 +247,9 @@ Create Create Create + Create Create + Create diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index a522698..17fda63 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -53,6 +53,8 @@ if(CMAKE_VERSION VERSION_GREATER "3.16.0") target_precompile_headers(exhaleLib PUBLIC ${PROJECT_SOURCE_DIR}/src/lib/exhaleLibPch.h) endif() +target_compile_definitions(exhaleLib PRIVATE EXHALE_DYN_LINK) + install(TARGETS exhaleLib ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} diff --git a/src/lib/exhaleLib_vs2012.vcxproj b/src/lib/exhaleLib_vs2012.vcxproj index 6744471..6108502 100644 --- a/src/lib/exhaleLib_vs2012.vcxproj +++ b/src/lib/exhaleLib_vs2012.vcxproj @@ -121,7 +121,7 @@ Disabled Use exhaleLibPch.h - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;EXHALE_DYN_LINK;%(PreprocessorDefinitions) true Level3 @@ -136,7 +136,7 @@ Disabled Use exhaleLibPch.h - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;EXHALE_DYN_LINK;%(PreprocessorDefinitions) true Level3 @@ -153,7 +153,7 @@ MaxSpeed Use exhaleLibPch.h - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;EXHALE_DYN_LINK;%(PreprocessorDefinitions) true Level3 @@ -172,7 +172,7 @@ MaxSpeed Use exhaleLibPch.h - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;EXHALE_DYN_LINK;%(PreprocessorDefinitions) true Level3 @@ -191,7 +191,7 @@ MaxSpeed Use exhaleLibPch.h - WIN32;NDEBUG;EXHALE_DYN_LINK;_LIB;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;EXHALE_DYN_LINK;%(PreprocessorDefinitions) true Level3 @@ -210,7 +210,7 @@ MaxSpeed Use exhaleLibPch.h - WIN32;NDEBUG;EXHALE_DYN_LINK;_LIB;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;EXHALE_DYN_LINK;%(PreprocessorDefinitions) true Level3 @@ -259,4 +259,4 @@ - \ No newline at end of file +