diff options
| author | Odd Stranne <odd@mullvad.net> | 2020-01-28 14:34:10 +0100 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2020-01-28 14:34:10 +0100 |
| commit | e13e04f5104557d8722666fc599502e9c336bdcc (patch) | |
| tree | 02696149b415b628c4291274e8a4fe22b12f9dd4 /windows/nsis-plugins/src/string | |
| parent | c48e088f5cd7bf101db33e117d8ea7acf86c9580 (diff) | |
| parent | 5ba8f62fb81f13f7ffa9b816ba33cbb814ce1417 (diff) | |
| download | mullvadvpn-e13e04f5104557d8722666fc599502e9c336bdcc.tar.xz mullvadvpn-e13e04f5104557d8722666fc599502e9c336bdcc.zip | |
Merge branch 'less-macro-magic'
Diffstat (limited to 'windows/nsis-plugins/src/string')
| -rw-r--r-- | windows/nsis-plugins/src/string/string.cpp | 4 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/string/string.vcxproj | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/windows/nsis-plugins/src/string/string.cpp b/windows/nsis-plugins/src/string/string.cpp index 6071e6303d..230a9a3696 100644 --- a/windows/nsis-plugins/src/string/string.cpp +++ b/windows/nsis-plugins/src/string/string.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include <nsis/pluginapi.h> -#include <stdexcept> +#include <libcommon/error.h> #include <string> // Suppress warnings caused by broken legacy code @@ -21,7 +21,7 @@ std::wstring PopString() if (!g_stacktop || !*g_stacktop) { - throw std::runtime_error("NSIS variable stack is corrupted"); + THROW_ERROR("NSIS variable stack is corrupted"); } stack_t *th = *g_stacktop; diff --git a/windows/nsis-plugins/src/string/string.vcxproj b/windows/nsis-plugins/src/string/string.vcxproj index bc3f32f528..af90ecb928 100644 --- a/windows/nsis-plugins/src/string/string.vcxproj +++ b/windows/nsis-plugins/src/string/string.vcxproj @@ -61,7 +61,7 @@ <SDLCheck>true</SDLCheck> <PreprocessorDefinitions>WIN32;_DEBUG;STRING_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories> <LanguageStandard>stdcpplatest</LanguageStandard> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> @@ -70,7 +70,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> <AdditionalLibraryDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/nsis/;$(SolutionDir)bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories> - <AdditionalDependencies>pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libcommon.lib;pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <IgnoreSpecificDefaultLibraries>libc.lib</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile>string.def</ModuleDefinitionFile> </Link> @@ -85,7 +85,7 @@ <SDLCheck>true</SDLCheck> <PreprocessorDefinitions>WIN32;NDEBUG;STRING_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <LanguageStandard>stdcpplatest</LanguageStandard> </ClCompile> @@ -96,7 +96,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> <AdditionalLibraryDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/nsis/;$(SolutionDir)bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories> - <AdditionalDependencies>pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libcommon.lib;pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <IgnoreSpecificDefaultLibraries>libc.lib</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile>string.def</ModuleDefinitionFile> </Link> |