Skip to content

Commit 1b95de4

Browse files
pbartfaipbartfai
committed
tinyxml2: remove TIXML_USE_STL definition
1 parent a421ad8 commit 1b95de4

File tree

9 files changed

+23
-34
lines changed

9 files changed

+23
-34
lines changed

‎3rdParty/tinyxml.cmd‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎3rdParty/tinyxml2/Makefile.pbartfai‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
EXECS= libtinyxml2$(POSTFIX).a
2-
CFLAGSLOC = -O3 -DTIXML_USE_STL
2+
CFLAGSLOC = -O3
33
LIBDIRS =
44
HOSTLIBS =
55

‎3rdParty/tinyxml2/tinyxml.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</ProjectConfiguration>
2020
</ItemGroup>
2121
<PropertyGroup Label="Globals">
22-
<ProjectName>tinyxmlSTL</ProjectName>
22+
<ProjectName>tinyxml</ProjectName>
2323
<ProjectGuid>{A3A84737-5017-4577-B8A2-79429A25B8B6}</ProjectGuid>
2424
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2525
</PropertyGroup>
@@ -76,27 +76,27 @@
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7777
<OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
7878
<IntDir>$(SolutionDir)Build\$(ProjectName)\$(Configuration)-inter\</IntDir>
79-
<TargetName>tinyxml_STL</TargetName>
79+
<TargetName>tinyxml</TargetName>
8080
</PropertyGroup>
8181
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8282
<OutDir>$(SolutionDir)Build\$(Configuration)64\</OutDir>
8383
<IntDir>$(SolutionDir)Build\$(ProjectName)\$(Configuration)64-inter\</IntDir>
84-
<TargetName>tinyxml_STL</TargetName>
84+
<TargetName>tinyxml</TargetName>
8585
</PropertyGroup>
8686
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8787
<OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
8888
<IntDir>$(SolutionDir)Build\$(ProjectName)\$(Configuration)-inter\</IntDir>
89-
<TargetName>tinyxml_STL</TargetName>
89+
<TargetName>tinyxml</TargetName>
9090
</PropertyGroup>
9191
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
9292
<OutDir>$(SolutionDir)Build\$(Configuration)64\</OutDir>
9393
<IntDir>$(SolutionDir)Build\$(ProjectName)\$(Configuration)64-inter\</IntDir>
94-
<TargetName>tinyxml_STL</TargetName>
94+
<TargetName>tinyxml</TargetName>
9595
</PropertyGroup>
9696
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9797
<ClCompile>
9898
<Optimization>Disabled</Optimization>
99-
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
99+
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100100
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
101101
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
102102
<BrowseInformation>true</BrowseInformation>
@@ -121,7 +121,7 @@
121121
</Midl>
122122
<ClCompile>
123123
<Optimization>Disabled</Optimization>
124-
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124+
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125125
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
126126
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
127127
<BrowseInformation>true</BrowseInformation>
@@ -145,7 +145,7 @@
145145
<ClCompile>
146146
<Optimization>MaxSpeed</Optimization>
147147
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
148-
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148+
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149149
<StringPooling>true</StringPooling>
150150
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
151151
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -171,7 +171,7 @@
171171
<ClCompile>
172172
<Optimization>MaxSpeed</Optimization>
173173
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
174-
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
174+
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
175175
<StringPooling>true</StringPooling>
176176
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
177177
<FunctionLevelLinking>true</FunctionLevelLinking>

‎BuildPartsCatalog/BuildPartsCatalog.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LDLoader", "..\LDLoader\LDL
2828
{A90C8BD0-BB72-4E5A-8C8D-2637966B0013} = {A90C8BD0-BB72-4E5A-8C8D-2637966B0013}
2929
EndProjectSection
3030
EndProject
31-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxmlSTL", "..\3rdParty\tinyxml\tinyxml.vcxproj", "{A3A84737-5017-4577-B8A2-79429A25B8B6}"
31+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "..\3rdParty\tinyxml\tinyxml.vcxproj", "{A3A84737-5017-4577-B8A2-79429A25B8B6}"
3232
EndProject
3333
Global
3434
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎LDExporter/LDExporter.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<Optimization>MaxSpeed</Optimization>
9595
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
9696
<AdditionalIncludeDirectories>../3rdParty;../boost/include;../;../include;../3rdParty/lib3ds;../3rdParty/tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
97-
<PreprocessorDefinitions>USE_CPP11;HAVE_MINIZIP;WIN32;NDEBUG;_LIB;_TC_STATIC;TIXML_USE_STL;EXPORT_3DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
97+
<PreprocessorDefinitions>USE_CPP11;HAVE_MINIZIP;WIN32;NDEBUG;_LIB;_TC_STATIC;EXPORT_3DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9898
<StringPooling>true</StringPooling>
9999
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
100100
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -121,7 +121,7 @@
121121
<Optimization>MaxSpeed</Optimization>
122122
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
123123
<AdditionalIncludeDirectories>../3rdParty;../boost/include;../;../include;../3rdParty/lib3ds;../3rdParty/tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
124-
<PreprocessorDefinitions>USE_CPP11;HAVE_MINIZIP;WIN32;NDEBUG;_LIB;_TC_STATIC;TIXML_USE_STL;EXPORT_3DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124+
<PreprocessorDefinitions>USE_CPP11;HAVE_MINIZIP;WIN32;NDEBUG;_LIB;_TC_STATIC;EXPORT_3DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125125
<StringPooling>true</StringPooling>
126126
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
127127
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -145,7 +145,7 @@
145145
<ClCompile>
146146
<Optimization>Disabled</Optimization>
147147
<AdditionalIncludeDirectories>../3rdParty;../boost/include;../;../include;../3rdParty/lib3ds;../3rdParty/tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
148-
<PreprocessorDefinitions>USE_CPP11;HAVE_MINIZIP;WIN32;_DEBUG;_LIB;_TC_STATIC;TIXML_USE_STL;EXPORT_3DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148+
<PreprocessorDefinitions>USE_CPP11;HAVE_MINIZIP;WIN32;_DEBUG;_LIB;_TC_STATIC;EXPORT_3DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149149
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
150150
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
151151
<BrowseInformation>true</BrowseInformation>
@@ -172,7 +172,7 @@
172172
<ClCompile>
173173
<Optimization>Disabled</Optimization>
174174
<AdditionalIncludeDirectories>../3rdParty;../boost/include;../;../include;../3rdParty/lib3ds;../3rdParty/tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
175-
<PreprocessorDefinitions>USE_CPP11;HAVE_MINIZIP;WIN32;_DEBUG;_LIB;_TC_STATIC;TIXML_USE_STL;EXPORT_3DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
175+
<PreprocessorDefinitions>USE_CPP11;HAVE_MINIZIP;WIN32;_DEBUG;_LIB;_TC_STATIC;EXPORT_3DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
176176
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
177177
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
178178
<BrowseInformation>true</BrowseInformation>

‎LDExporter/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
EXECS= libLDExporter$(POSTFIX).a
2-
CFLAGSLOC = -O3 -I ../3rdParty/lib3ds -D TIXML_USE_STL ${TINYXML}
2+
CFLAGSLOC = -O3 -I ../3rdParty/lib3ds ${TINYXML}
33
LIBDIRS =
44
HOSTLIBS =
55

66
-include ../Makefile.inc
77

8-
debug: CFLAGSLOC = -g -I ../3rdParty/lib3ds -D TIXML_USE_STL ${TINYXML}
8+
debug: CFLAGSLOC = -g -I ../3rdParty/lib3ds ${TINYXML}
99
debug: all
1010

1111
-include .depend

‎LDView.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LDExporter", "LDExporter\LD
3636
EndProject
3737
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LDVLib", "LDVLib\LDVLib.vcxproj", "{018FC49D-3A13-405F-8DB3-EDF7F0E9D900}"
3838
EndProject
39-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxmlSTL", "3rdParty\tinyxml2\tinyxml.vcxproj", "{A3A84737-5017-4577-B8A2-79429A25B8B6}"
39+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "3rdParty\tinyxml2\tinyxml.vcxproj", "{A3A84737-5017-4577-B8A2-79429A25B8B6}"
4040
EndProject
4141
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl2ps", "3rdParty\gl2ps\gl2ps.vcxproj", "{0964B5FE-C040-42A6-9370-FC6708197185}"
4242
EndProject

‎LGEOTables/LGEOTables.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LGEOTables", "LGEOTables.vc
1212
{AF6422A6-7787-48C7-AF33-E7F76EF1E82A} = {AF6422A6-7787-48C7-AF33-E7F76EF1E82A}
1313
EndProjectSection
1414
EndProject
15-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxmlSTL", "..\3rdParty\tinyxml2\tinyxml.vcxproj", "{A3A84737-5017-4577-B8A2-79429A25B8B6}"
15+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "..\3rdParty\tinyxml2\tinyxml.vcxproj", "{A3A84737-5017-4577-B8A2-79429A25B8B6}"
1616
EndProject
1717
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TCFoundation", "..\TCFoundation\TCFoundation.vcxproj", "{29CAFA41-FC7A-4DF3-BC68-6E73B5308E26}"
1818
EndProject

‎LGEOTables/LGEOTables.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<ClCompile>
9191
<Optimization>Disabled</Optimization>
9292
<AdditionalIncludeDirectories>../;../3rdParty/tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
93-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS=1;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9595
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
9696
<PrecompiledHeader />
@@ -109,7 +109,7 @@
109109
<ClCompile>
110110
<Optimization>Disabled</Optimization>
111111
<AdditionalIncludeDirectories>../;../3rdParty/tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
112-
<PreprocessorDefinitions>USE_CPP11;_DEBUG;WIN32;_WINDOWS;_WIN32_WINDOWS=0x0501;_WIN32_WINNT=0x0501;_CONSOLE;_CRT_SECURE_NO_WARNINGS=1;TIXML_USE_STL;_TC_STATIC;SUPPORT_MOVED_TOS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112+
<PreprocessorDefinitions>USE_CPP11;_DEBUG;WIN32;_WINDOWS;_WIN32_WINDOWS=0x0501;_WIN32_WINNT=0x0501;_CONSOLE;_CRT_SECURE_NO_WARNINGS=1;_TC_STATIC;SUPPORT_MOVED_TOS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
113113
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
114114
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
115115
<PrecompiledHeader>
@@ -128,7 +128,7 @@
128128
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
129129
<ClCompile>
130130
<AdditionalIncludeDirectories>../;../3rdParty/tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
131-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS=1;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
132132
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
133133
<PrecompiledHeader />
134134
<WarningLevel>Level4</WarningLevel>
@@ -147,7 +147,7 @@
147147
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
148148
<ClCompile>
149149
<AdditionalIncludeDirectories>../;../3rdParty/tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
150-
<PreprocessorDefinitions>USE_CPP11;NDEBUG;WIN32;_WINDOWS;_WIN32_WINDOWS=0x0501;_WIN32_WINNT=0x0501;_TC_STATIC;_CONSOLE;_CRT_SECURE_NO_WARNINGS=1;TIXML_USE_STL;SUPPORT_MOVED_TOS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
150+
<PreprocessorDefinitions>USE_CPP11;NDEBUG;WIN32;_WINDOWS;_WIN32_WINDOWS=0x0501;_WIN32_WINNT=0x0501;_TC_STATIC;_CONSOLE;_CRT_SECURE_NO_WARNINGS=1;SUPPORT_MOVED_TOS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
151151
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
152152
<PrecompiledHeader>
153153
</PrecompiledHeader>

0 commit comments

Comments
 (0)