Skip to content

Commit bd7e7f0

Browse files
committed
Build Zlib from source. LDView.vcxproj and LDExporter.vcxproj is intentionally skipped to avoid conflict with branch tinyxml2. 3rdParty/zlib must be added into Include search path
1 parent d1e0b1a commit bd7e7f0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+23205
-29
lines changed

3rdParty/gl2ps/gl2ps.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9393
<ClCompile>
9494
<Optimization>Disabled</Optimization>
95-
<AdditionalIncludeDirectories>../../include;../libpng;../libpng/Windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
95+
<AdditionalIncludeDirectories>../../include;../zlib;../libpng;../libpng/Windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9696
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;GL2PS_HAVE_ZLIB;GL2PS_HAVE_LIBPNG;_CRT_SECURE_NO_DEPRECATE;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9797
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9898
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -118,7 +118,7 @@
118118
</Midl>
119119
<ClCompile>
120120
<Optimization>Disabled</Optimization>
121-
<AdditionalIncludeDirectories>../../include;../libpng;../libpng/Windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
121+
<AdditionalIncludeDirectories>../../include;../zlib;../libpng;../libpng/Windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
122122
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;GL2PS_HAVE_ZLIB;GL2PS_HAVE_LIBPNG;_CRT_SECURE_NO_DEPRECATE;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123123
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
124124
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -143,7 +143,7 @@
143143
<ClCompile>
144144
<Optimization>MaxSpeed</Optimization>
145145
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
146-
<AdditionalIncludeDirectories>../../include;../libpng;../libpng/Windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
146+
<AdditionalIncludeDirectories>../../include;../zlib;../libpng;../libpng/Windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
147147
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;GL2PS_HAVE_ZLIB;GL2PS_HAVE_LIBPNG;_CRT_SECURE_NO_DEPRECATE;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148148
<StringPooling>true</StringPooling>
149149
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -170,7 +170,7 @@
170170
<ClCompile>
171171
<Optimization>MaxSpeed</Optimization>
172172
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
173-
<AdditionalIncludeDirectories>../../include;../libpng;../libpng/Windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
173+
<AdditionalIncludeDirectories>../../include;../zlib;../libpng;../libpng/Windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
174174
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;GL2PS_HAVE_ZLIB;GL2PS_HAVE_LIBPNG;_CRT_SECURE_NO_DEPRECATE;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
175175
<StringPooling>true</StringPooling>
176176
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

3rdParty/minizip/minizip.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<SDLCheck>true</SDLCheck>
9797
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9898
<ConformanceMode>true</ConformanceMode>
99-
<AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
99+
<AdditionalIncludeDirectories>../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
100100
</ClCompile>
101101
<Link>
102102
<SubSystem>Console</SubSystem>
@@ -111,7 +111,7 @@
111111
<SDLCheck>true</SDLCheck>
112112
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
113113
<ConformanceMode>true</ConformanceMode>
114-
<AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
114+
<AdditionalIncludeDirectories>../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115115
</ClCompile>
116116
<Link>
117117
<SubSystem>Console</SubSystem>
@@ -127,7 +127,7 @@
127127
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128128
<ConformanceMode>true</ConformanceMode>
129129
<LanguageStandard>stdcpp17</LanguageStandard>
130-
<AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
130+
<AdditionalIncludeDirectories>../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
131131
</ClCompile>
132132
<Link>
133133
<SubSystem>Console</SubSystem>
@@ -143,7 +143,7 @@
143143
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144144
<ConformanceMode>true</ConformanceMode>
145145
<LanguageStandard>stdcpp17</LanguageStandard>
146-
<AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
146+
<AdditionalIncludeDirectories>../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
147147
</ClCompile>
148148
<Link>
149149
<SubSystem>Console</SubSystem>

0 commit comments

Comments
 (0)