Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Compile with /MTd instead of /MDd in Debug Configuration.
  • Loading branch information
quangnh89 committed Aug 19, 2016
1 parent 2d3ead3 commit bb70320
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 13 deletions.
2 changes: 2 additions & 0 deletions SalityKiller/SalityKiller.vcxproj
Expand Up @@ -93,6 +93,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SALITYKILLER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -110,6 +111,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;SALITYKILLER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down
2 changes: 2 additions & 0 deletions TinyAvConsole/TinyAvConsole.vcxproj
Expand Up @@ -102,6 +102,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -118,6 +119,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand Down
5 changes: 5 additions & 0 deletions TinyAvCore/FileSystem/zip/UnzipHelper.cpp
@@ -1,6 +1,11 @@
#include "UnzipHelper.h"

#ifdef _DEBUG
#pragma comment(lib, "zlibstaticd.lib")
#else
#pragma comment(lib, "zlibstatic.lib")
#endif // _DEBUG

static void TranslateOpenMode(__in int mode, __out ULONG *creationMode)
{
*creationMode = 0;
Expand Down
2 changes: 2 additions & 0 deletions TinyAvCore/TinyAvCore.vcxproj
Expand Up @@ -145,6 +145,7 @@
<PreprocessorDefinitions>DYNLOAD;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>true</TreatWarningAsError>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\include;$(SolutionDir)libs\zlib;$(SolutionDir)libs\zlib\build;$(SolutionDir)libs\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -160,6 +161,7 @@
<PreprocessorDefinitions>DYNLOAD;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>true</TreatWarningAsError>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\include;$(SolutionDir)libs\zlib;$(SolutionDir)libs\zlib\build;$(SolutionDir)libs\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down
22 changes: 14 additions & 8 deletions ci/windows/build_appveyor.bat
Expand Up @@ -17,18 +17,24 @@ set generator=Visual Studio 14 2015
if /I "%1" == "x64" (set generator=%generator% Win64)

:: build googletest library
md libs\googletest\googletest\build
pushd libs\googletest\googletest\build
cmake -G "%generator%" -DCMAKE_CONFIGURATION_TYPES="%2" ..
set build_gtest_dir=libs\googletest\googletest\build
if exist "%build_gtest_dir%" (
del /S /Q "%build_gtest_dir%"
)
md "%build_gtest_dir%"
pushd "%build_gtest_dir%"
cmake -G "%generator%" -DCMAKE_CONFIGURATION_TYPES="%2" -DCMAKE_C_FLAGS_RELEASE="/MT" -DCMAKE_C_FLAGS_DEBUG="/MTd" ..
cmake --build . --config "%2"
popd

:: build zlib library
md libs\zlib\build
pushd libs\zlib\build
set ZLIB_C_FLAGS=
if /I "%2" == "Release" (set ZLIB_C_FLAGS=/MT)
cmake -G "%generator%" -DCMAKE_CONFIGURATION_TYPES="%2" -DCMAKE_C_FLAGS_RELEASE="%ZLIB_C_FLAGS%" ..
set build_zlib_dir=libs\zlib\build
if exist "%build_zlib_dir%" (
del /S /Q "%build_zlib_dir%"
)
md "%build_zlib_dir%"
pushd "%build_zlib_dir%"
cmake -G "%generator%" -DCMAKE_CONFIGURATION_TYPES="%2" -DCMAKE_C_FLAGS_RELEASE="/MT" -DCMAKE_C_FLAGS_DEBUG="/MTd" ..
cmake --build . --config "%2"
popd

Expand Down
2 changes: 2 additions & 0 deletions tests/Unittests/Unittests.vcxproj
Expand Up @@ -89,6 +89,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\googletest\googletest\include;$(SolutionDir)libs\include;$(SolutionDir)libs\zlib;$(SolutionDir)libs\zlib\build;$(SolutionDir)libs\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -104,6 +105,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\googletest\googletest\include;$(SolutionDir)libs\include;$(SolutionDir)libs\zlib;$(SolutionDir)libs\zlib\build;$(SolutionDir)libs\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand Down
5 changes: 0 additions & 5 deletions tests/Unittests/main.cpp
@@ -1,10 +1,5 @@
#include <gtest/gtest.h>
#ifdef _DEBUG
#pragma comment(lib, "gtestd.lib" )
#else
#pragma comment(lib, "gtest.lib" )
#endif // _DEBUG

#pragma comment(lib, "TinyAvCore.lib" )
#include <windows.h>
#include <shlwapi.h>
Expand Down

0 comments on commit bb70320

Please sign in to comment.