Merge pull request GPSBabel#11 from gpsbabel/nuke-expat

Nuke expat
miz884 · Sep 17, 2015 · ef74dc6 · ef74dc6
2 parents f72c807 + fb93450
commit ef74dc6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/gui/setup.iss.in b/gui/setup.iss.in
@@ -46,7 +46,6 @@ Source: gmapbase.html; 			DestDir: "{app}"; Flags: ignoreversion
 Source: qt.conf;       			DestDir: "{app}"; Flags: ignoreversion
 
 Source: \gpsbabel\gui\release\gpsbabelfe.exe; 	DestDir: "{app}"; Flags: ignoreversion
-;Source: release\libexpat.dll;   	DestDir: "{app}"; Flags: ignoreversion
 Source: \gpsbabel\gpsbabel\release\gpsbabel.exe;   	DestDir: "{app}"; Flags: ignoreversion
 ; Source: release\help\*;           	DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs
 

diff --git a/msvc/GPSBabel.vcxproj b/msvc/GPSBabel.vcxproj
@@ -38,7 +38,6 @@
       <HeaderFileName />
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>
       <WarningLevel>Level3</WarningLevel>
       <TreatWarningAsError>false</TreatWarningAsError>
@@ -305,9 +304,6 @@
     <ClCompile Include="..\zlib\uncompr.c" />
     <ClCompile Include="..\zlib\zutil.c" />
   </ItemGroup>
-  <ItemGroup>
-    <Library Include="Expat\libexpat.lib" />
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\cet.h" />
     <ClInclude Include="..\cet_util.h" />