add /vd2 to all *mm projects

codekiddy2 · Jan 1, 2016 · 17379ae · 17379ae
1 parent 223d914
commit 17379ae
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 9 deletions.
diff --git a/projects/master/msvc-140/Test/test_dynamic_cast/main.cpp b/projects/master/msvc-140/Test/test_dynamic_cast/main.cpp
@@ -1,7 +1,7 @@
 // main.cpp
 // defines application entry point
 
-#include "stdafx.h"
+#include "pch.hh"
 #include <iostream>
 #include <sstream>
 

diff --git a/.../msvc-140/Test/test_dynamic_cast/stdafx.h → ...er/msvc-140/Test/test_dynamic_cast/pch.hh b/.../msvc-140/Test/test_dynamic_cast/stdafx.h → ...er/msvc-140/Test/test_dynamic_cast/pch.hh
diff --git a/projects/master/msvc-140/Test/test_dynamic_cast/stdafx.cpp b/projects/master/msvc-140/Test/test_dynamic_cast/stdafx.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "pch.hh"
 
 // stdafx.cpp
 // compiles PCH file for faster compilation and intellisense

diff --git a/projects/master/msvc-140/Test/test_dynamic_cast/test_dynamic_cast.vcxproj b/projects/master/msvc-140/Test/test_dynamic_cast/test_dynamic_cast.vcxproj
@@ -84,6 +84,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
     </Link>
+    <ClCompile />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile />
@@ -110,7 +111,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="pch.hh" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />

diff --git a/projects/master/msvc-140/Test/test_dynamic_cast/test_dynamic_cast.vcxproj.filters b/projects/master/msvc-140/Test/test_dynamic_cast/test_dynamic_cast.vcxproj.filters
@@ -10,11 +10,6 @@
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
@@ -23,4 +18,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.hh">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
diff --git a/properties/base_stack.props b/properties/base_stack.props
@@ -68,6 +68,8 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <UseUnicodeForAssemblerListing>false</UseUnicodeForAssemblerListing>
       <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalOptions>/Zc:strictStrings /Zc:trigraphs %(AdditionalOptions)</AdditionalOptions>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
       <ShowProgress>LinkVerboseSAFESEH</ShowProgress>

diff --git a/properties/stack_gtkmm.props b/properties/stack_gtkmm.props
@@ -8,6 +8,7 @@
       <CompileAs>CompileAsCpp</CompileAs>
       <AdditionalIncludeDirectories>$(INCLUDE_DIR)gtkmm;$(INCLUDE_DIR)sigc++;$(INCLUDE_DIR)goocanvasmm;$(INCLUDE_DIR)glibmm;$(INCLUDE_DIR)pangomm;$(INCLUDE_DIR)cairomm;$(INCLUDE_DIR)atkmm;$(LIB_DIR)sigc++\include;$(LIB_DIR)glibmm\include;$(LIB_DIR)pangomm\include;$(LIB_DIR)giomm\include;$(LIB_DIR)cairomm\include;$(LIB_DIR)atkmm\include;$(LIB_DIR)gdkmm\include;$(LIB_DIR)gtkmm\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>glib.dll.lib;gobject.dll.lib;gmodule.dll.lib;gio.dll.lib;atk.dll.lib;cairo.dll.lib;pango.dll.lib;pangocairo.dll.lib;gtk.dll.lib;gdk.dll.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/properties/user_stack_gtkmm.props b/properties/user_stack_gtkmm.props
@@ -8,6 +8,7 @@
       <AdditionalIncludeDirectories>$(INCLUDE_DIR)gtkmm;$(INCLUDE_DIR)glibmm;$(INCLUDE_DIR)sigc++;$(INCLUDE_DIR)cairomm;$(INCLUDE_DIR)pangomm;$(INCLUDE_DIR)atkmm;$(INCLUDE_DIR)goocanvasmm;$(LIB_DIR)gtkmm\include;$(LIB_DIR)gdkmm\include;$(LIB_DIR)glibmm\include;$(LIB_DIR)giomm\include;$(LIB_DIR)sigc++\include;$(LIB_DIR)cairomm\include;$(LIB_DIR)pangomm\include;$(LIB_DIR)atkmm\include;$(LIB_DIR)goocanvasmm\include;$(INCLUDE_DIR)gtk;$(INCLUDE_DIR)glib;$(INCLUDE_DIR)cairo;$(INCLUDE_DIR)pango;$(INCLUDE_DIR)atk;$(INCLUDE_DIR)goocanvas;$(LIB_DIR)glib\include;$(INCLUDE_DIR)gdk-pixbuf;$(INCLUDE_DIR)pixman;$(INCLUDE_DIR);$(INCLUDE_DIR)jbig;$(INCLUDE_DIR)gettext\intl;$(INCLUDE_DIR)iconv;$(INCLUDE_DIR)dirent;$(INCLUDE_DIR)harfbuzz;$(INCLUDE_DIR)expat;$(INCLUDE_DIR)zlib;$(INCLUDE_DIR)jpeg-turbo;$(INCLUDE_DIR)freetype;$(INCLUDE_DIR)png;$(INCLUDE_DIR)ffi;$(INCLUDE_DIR)tiff;$(INCLUDE_DIR)pcre;$(INCLUDE_DIR)bzip2;$(INCLUDE_DIR)icu;$(INCLUDE_DIR)lzma;$(INCLUDE_DIR)editline;$(INCLUDE_DIR)gettext\libasprintf;$(INCLUDE_DIR)libxml;$(INCLUDE_DIR)fontconfig;$(INCLUDE_DIR)gstreamer;$(INCLUDE_DIR)pcre2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <PreprocessorDefinitions>_WINDOWS;GIOMM_DISABLE_DEPRECATED=1;GLIBMM_DISABLE_DEPRECATED=1;SIGCXX_DISABLE_DEPRECATED=1;ATKMM_DISABLE_DEPRECATED=1;CAIROMM_DISABLE_DEPRECATED=1;PANGOMM_DISABLE_DEPRECATED=1;GDKMM_DISABLE_DEPRECATED=1;GTKMM_DISABLE_DEPRECATED=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>goocanvasmm.dll.lib;gtkmm.dll.lib;gdkmm.dll.lib;glibmm.dll.lib;giomm.dll.lib;cairomm.dll.lib;atkmm.dll.lib;pangomm.dll.lib;sigc++.dll.lib;gtk.dll.lib;gdk.dll.lib;glib.dll.lib;gio.dll.lib;cairo.dll.lib;atk.dll.lib;pango.dll.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/readme/TODO.md b/readme/TODO.md
@@ -3,7 +3,7 @@
 
 **HIGH PRIORITY TASKS**
 
-* compile entry stack with /Za /Zc:strictStrings /Zc:trigraphs /Zc:rvalueCast (enable type conversion rules)
+* compile entry stack with /Zc:strictStrings /Zc:trigraphs /Zc:rvalueCast (enable type conversion rules) (not using /Za, it's buggy, see below 'boost' link)
 * convert install projects to make file projects, (for clean, build and rebuild, ex. to remove headers)
 * move all solutions into source's root directory
 * rename projects (in windows explorer) so that the name is the same as in solutions