New installer: Fix Release build

This commit is contained in:
Birunthan Mohanathas 2014-02-08 09:47:12 +02:00
parent 4fd398ddfb
commit 98b925fe7c
4 changed files with 24 additions and 11 deletions

View File

@ -21,6 +21,8 @@
#include "StdAfx.h" #include "StdAfx.h"
#include "MathParser.h" #include "MathParser.h"
#include <string>
namespace MathParser { namespace MathParser {
static const double M_E = 2.7182818284590452354; static const double M_E = 2.7182818284590452354;

View File

@ -19,6 +19,9 @@
#ifndef __STDAFX_H__ #ifndef __STDAFX_H__
#define __STDAFX_H__ #define __STDAFX_H__
// Common is used by projects that don't link to msvcpNNN.dll at all so this header should include
// only C compatible headers.
#define _CRTDBG_MAP_ALLOC #define _CRTDBG_MAP_ALLOC
#include <crtdbg.h> #include <crtdbg.h>
@ -34,11 +37,8 @@
#include <wincodec.h> #include <wincodec.h>
#include <wrl/client.h> #include <wrl/client.h>
#include <cassert> #include <assert.h>
#include <cmath> #include <math.h>
#include <cstdint> #include <stdint.h>
#include <memory>
#include <string>
#include <vector>
#endif #endif

View File

@ -26,9 +26,13 @@
</Manifest> </Manifest>
<ClCompile> <ClCompile>
<DisableSpecificWarnings>4800;4996</DisableSpecificWarnings> <DisableSpecificWarnings>4800;4996</DisableSpecificWarnings>
<BufferSecurityCheck>false</BufferSecurityCheck>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\Common\ControlTemplate.cpp" />
<ClCompile Include="..\Common\Dialog.cpp" />
<ClCompile Include="..\Common\Platform.cpp" />
<ClCompile Include="Application.cpp" /> <ClCompile Include="Application.cpp" />
<ClCompile Include="DialogInstall.cpp" /> <ClCompile Include="DialogInstall.cpp" />
<ClCompile Include="Install.cpp" /> <ClCompile Include="Install.cpp" />
@ -74,11 +78,6 @@
<ItemGroup> <ItemGroup>
<ResourceCompile Include="Installer.rc" /> <ResourceCompile Include="Installer.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{19312085-aa51-4bd6-be92-4b6098cca539}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

View File

@ -16,6 +16,9 @@
<Filter Include="lzma"> <Filter Include="lzma">
<UniqueIdentifier>{9588f54f-9188-40b7-b750-260f5f514ee5}</UniqueIdentifier> <UniqueIdentifier>{9588f54f-9188-40b7-b750-260f5f514ee5}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Common">
<UniqueIdentifier>{6acda1fa-eb7e-490b-ae49-ed7ff8b2534d}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Application.cpp"> <ClCompile Include="Application.cpp">
@ -78,6 +81,15 @@
<ClCompile Include="DialogInstall.cpp"> <ClCompile Include="DialogInstall.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\Common\Platform.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\Common\ControlTemplate.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\Common\Dialog.cpp">
<Filter>Common</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Application.h"> <ClInclude Include="Application.h">