Loading

Paste #p8xz3wdqc

Wrap Raw Revise
  1. Index: src/rev.cpp.in
  2. ===================================================================
  3. --- src/rev.cpp.in  (.../branches/1.8)  (revision 28004)
  4. +++ src/rev.cpp.in  (.../tags/1.8.0)    (revision 28004)
  5. @@ -72,7 +72,7 @@
  6.   * final release will always have a lower version number than the released
  7.   * version, thus making comparisons on specific revisions easy.
  8.   */
  9. -const uint32 _openttd_newgrf_version = 1 << 28 | 8 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
  10. +const uint32 _openttd_newgrf_version = 1 << 28 | 8 << 24 | 0 << 20 | 1 << 19 | (!!REVISION!! & ((1 << 19) - 1));
  11.  
  12.  #ifdef __MORPHOS__
  13.  /**
  14. Index: projects/openttd_vs80.vcproj
  15. ===================================================================
  16. --- projects/openttd_vs80.vcproj    (.../branches/1.8)  (revision 28004)
  17. +++ projects/openttd_vs80.vcproj    (.../tags/1.8.0)    (revision 28004)
  18. @@ -52,7 +52,7 @@
  19.                 FavorSizeOrSpeed="2"
  20.                 OmitFramePointers="true"
  21.                 AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
  22. -               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
  23. +               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
  24.                 StringPooling="true"
  25.                 ExceptionHandling="1"
  26.                 RuntimeLibrary="0"
  27. @@ -257,7 +257,7 @@
  28.                 FavorSizeOrSpeed="2"
  29.                 OmitFramePointers="true"
  30.                 AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
  31. -               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
  32. +               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
  33.                 StringPooling="true"
  34.                 ExceptionHandling="1"
  35.                 RuntimeLibrary="0"
  36. Index: projects/openttd_vs90.vcproj
  37. ===================================================================
  38. --- projects/openttd_vs90.vcproj    (.../branches/1.8)  (revision 28004)
  39. +++ projects/openttd_vs90.vcproj    (.../tags/1.8.0)    (revision 28004)
  40. @@ -53,7 +53,7 @@
  41.                 FavorSizeOrSpeed="2"
  42.                 OmitFramePointers="true"
  43.                 AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
  44. -               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
  45. +               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
  46.                 StringPooling="true"
  47.                 ExceptionHandling="1"
  48.                 RuntimeLibrary="0"
  49. @@ -255,7 +255,7 @@
  50.                 FavorSizeOrSpeed="2"
  51.                 OmitFramePointers="true"
  52.                 AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
  53. -               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
  54. +               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
  55.                 StringPooling="true"
  56.                 ExceptionHandling="1"
  57.                 RuntimeLibrary="0"
  58. Index: projects/openttd_vs90.vcproj.in
  59. ===================================================================
  60. --- projects/openttd_vs90.vcproj.in (.../branches/1.8)  (revision 28004)
  61. +++ projects/openttd_vs90.vcproj.in (.../tags/1.8.0)    (revision 28004)
  62. @@ -53,7 +53,7 @@
  63.                 FavorSizeOrSpeed="2"
  64.                 OmitFramePointers="true"
  65.                 AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
  66. -               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
  67. +               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
  68.                 StringPooling="true"
  69.                 ExceptionHandling="1"
  70.                 RuntimeLibrary="0"
  71. @@ -255,7 +255,7 @@
  72.                 FavorSizeOrSpeed="2"
  73.                 OmitFramePointers="true"
  74.                 AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
  75. -               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
  76. +               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
  77.                 StringPooling="true"
  78.                 ExceptionHandling="1"
  79.                 RuntimeLibrary="0"
  80. Index: projects/openttd_vs80.vcproj.in
  81. ===================================================================
  82. --- projects/openttd_vs80.vcproj.in (.../branches/1.8)  (revision 28004)
  83. +++ projects/openttd_vs80.vcproj.in (.../tags/1.8.0)    (revision 28004)
  84. @@ -52,7 +52,7 @@
  85.                 FavorSizeOrSpeed="2"
  86.                 OmitFramePointers="true"
  87.                 AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
  88. -               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
  89. +               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
  90.                 StringPooling="true"
  91.                 ExceptionHandling="1"
  92.                 RuntimeLibrary="0"
  93. @@ -257,7 +257,7 @@
  94.                 FavorSizeOrSpeed="2"
  95.                 OmitFramePointers="true"
  96.                 AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
  97. -               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
  98. +               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
  99.                 StringPooling="true"
  100.                 ExceptionHandling="1"
  101.                 RuntimeLibrary="0"
  102. Index: projects/openttd_vs100.vcxproj
  103. ===================================================================
  104. --- projects/openttd_vs100.vcxproj  (.../branches/1.8)  (revision 28004)
  105. +++ projects/openttd_vs100.vcxproj  (.../tags/1.8.0)    (revision 28004)
  106. @@ -102,7 +102,7 @@
  107.        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
  108.        <OmitFramePointers>true</OmitFramePointers>
  109.        <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  110. -      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  111. +      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
  112.        <StringPooling>true</StringPooling>
  113.        <ExceptionHandling>Sync</ExceptionHandling>
  114.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  115. @@ -210,7 +210,7 @@
  116.        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
  117.        <OmitFramePointers>true</OmitFramePointers>
  118.        <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  119. -      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  120. +      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  121.        <StringPooling>true</StringPooling>
  122.        <ExceptionHandling>Sync</ExceptionHandling>
  123.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  124. Index: projects/openttd_vs140.vcxproj
  125. ===================================================================
  126. --- projects/openttd_vs140.vcxproj  (.../branches/1.8)  (revision 28004)
  127. +++ projects/openttd_vs140.vcxproj  (.../tags/1.8.0)    (revision 28004)
  128. @@ -105,7 +105,7 @@
  129.        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
  130.        <OmitFramePointers>true</OmitFramePointers>
  131.        <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  132. -      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  133. +      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
  134.        <StringPooling>true</StringPooling>
  135.        <ExceptionHandling>Sync</ExceptionHandling>
  136.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  137. @@ -220,7 +220,7 @@
  138.        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
  139.        <OmitFramePointers>true</OmitFramePointers>
  140.        <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  141. -      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  142. +      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  143.        <StringPooling>true</StringPooling>
  144.        <ExceptionHandling>Sync</ExceptionHandling>
  145.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  146. Index: projects/openttd_vs100.vcxproj.in
  147. ===================================================================
  148. --- projects/openttd_vs100.vcxproj.in   (.../branches/1.8)  (revision 28004)
  149. +++ projects/openttd_vs100.vcxproj.in   (.../tags/1.8.0)    (revision 28004)
  150. @@ -102,7 +102,7 @@
  151.        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
  152.        <OmitFramePointers>true</OmitFramePointers>
  153.        <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  154. -      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  155. +      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
  156.        <StringPooling>true</StringPooling>
  157.        <ExceptionHandling>Sync</ExceptionHandling>
  158.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  159. @@ -210,7 +210,7 @@
  160.        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
  161.        <OmitFramePointers>true</OmitFramePointers>
  162.        <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  163. -      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  164. +      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  165.        <StringPooling>true</StringPooling>
  166.        <ExceptionHandling>Sync</ExceptionHandling>
  167.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  168. Index: projects/openttd_vs140.vcxproj.in
  169. ===================================================================
  170. --- projects/openttd_vs140.vcxproj.in   (.../branches/1.8)  (revision 28004)
  171. +++ projects/openttd_vs140.vcxproj.in   (.../tags/1.8.0)    (revision 28004)
  172. @@ -105,7 +105,7 @@
  173.        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
  174.        <OmitFramePointers>true</OmitFramePointers>
  175.        <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  176. -      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  177. +      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
  178.        <StringPooling>true</StringPooling>
  179.        <ExceptionHandling>Sync</ExceptionHandling>
  180.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  181. @@ -220,7 +220,7 @@
  182.        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
  183.        <OmitFramePointers>true</OmitFramePointers>
  184.        <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  185. -      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  186. +      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  187.        <StringPooling>true</StringPooling>
  188.        <ExceptionHandling>Sync</ExceptionHandling>
  189.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  190. Index: config.lib
  191. ===================================================================
  192. --- config.lib  (.../branches/1.8)  (revision 28004)
  193. +++ config.lib  (.../tags/1.8.0)    (revision 28004)
  194. @@ -58,8 +58,8 @@
  195.     enable_translator="0"
  196.     enable_unicode="1"
  197.     enable_console="1";
  198. -   enable_assert="1"
  199. -   enable_strip="0"
  200. +   enable_assert="0"
  201. +   enable_strip="1"
  202.     enable_universal="0"
  203.     enable_osx_g5="0"
  204.     enable_cocoa_quartz="1"
  205.  
Posted by Anonymous at 03 Mar 2019, 14:03:20 UTC
Language: diff • Views: 710

Comments