Integrate loadlibrary.c into build systems

11 files changed, 21 insertions, 1 deletions

diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index 398b5550..568e4bd4 100644
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -54,6 +54,7 @@ if(WIN32)
 endif(WIN32)

 

 set(expat_SRCS

+    lib/loadlibrary.c

     lib/xmlparse.c

     lib/xmlrole.c

     lib/xmltok.c

diff --git a/expat/MANIFEST b/expat/MANIFEST
index c8479ed0..c90dadc0 100644
--- a/expat/MANIFEST
+++ b/expat/MANIFEST
@@ -45,6 +45,7 @@ lib/internal.h
 lib/latin1tab.h
 lib/libexpat.def
 lib/libexpatw.def
+lib/loadlibrary.c
 lib/nametab.h
 lib/siphash.h
 lib/utf8tab.h
diff --git a/expat/Makefile.in b/expat/Makefile.in
index 76f77b17..3e98d242 100644
--- a/expat/Makefile.in
+++ b/expat/Makefile.in
@@ -128,7 +128,7 @@ LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG)
 LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
 LINK_CXX_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXXCOMPILE) $(LDFLAGS) -o $@
 
-LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
+LIB_OBJS = lib/loadlibrary.lo lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
 $(LIBRARY): $(LIB_OBJS)
 	$(LINK_LIB) $(LIB_OBJS)
 
@@ -138,6 +138,8 @@ expat.pc: $(top_builddir)/config.status
 lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/siphash.h lib/xmlrole.h lib/xmltok.h \
 	$(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
 
+lib/loadlibrary.lo: lib/loadlibrary.c
+
 lib/xmlrole.lo: lib/xmlrole.c lib/ascii.h lib/xmlrole.h \
 	$(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
 
diff --git a/expat/lib/expat.vcxproj b/expat/lib/expat.vcxproj
index 1673e676..7270b874 100644
--- a/expat/lib/expat.vcxproj
+++ b/expat/lib/expat.vcxproj
@@ -147,6 +147,7 @@
     <CustomBuild Include="libexpat.def" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c" />
     <ClCompile Include="xmlparse.c">
       <ExceptionHandling Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </ExceptionHandling>
diff --git a/expat/lib/expat.vcxproj.filters b/expat/lib/expat.vcxproj.filters
index 34aea26d..61c52b58 100644
--- a/expat/lib/expat.vcxproj.filters
+++ b/expat/lib/expat.vcxproj.filters
@@ -15,6 +15,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/expat/lib/expat_static.vcxproj b/expat/lib/expat_static.vcxproj
index 77c0ece9..512e4c98 100644
--- a/expat/lib/expat_static.vcxproj
+++ b/expat/lib/expat_static.vcxproj
@@ -120,6 +120,7 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c" />
     <ClCompile Include="xmlparse.c" />
     <ClCompile Include="xmlrole.c" />
     <ClCompile Include="xmltok.c" />
diff --git a/expat/lib/expat_static.vcxproj.filters b/expat/lib/expat_static.vcxproj.filters
index e6d9d80f..a2fe03e6 100644
--- a/expat/lib/expat_static.vcxproj.filters
+++ b/expat/lib/expat_static.vcxproj.filters
@@ -11,6 +11,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/expat/lib/expatw.vcxproj b/expat/lib/expatw.vcxproj
index cf54fd2a..d42944db 100644
--- a/expat/lib/expatw.vcxproj
+++ b/expat/lib/expatw.vcxproj
@@ -147,6 +147,7 @@
     <CustomBuild Include="libexpatw.def" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c" />
     <ClCompile Include="xmlparse.c">
       <ExceptionHandling Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </ExceptionHandling>
diff --git a/expat/lib/expatw.vcxproj.filters b/expat/lib/expatw.vcxproj.filters
index dc6e9685..fb3909c9 100644
--- a/expat/lib/expatw.vcxproj.filters
+++ b/expat/lib/expatw.vcxproj.filters
@@ -15,6 +15,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/expat/lib/expatw_static.vcxproj b/expat/lib/expatw_static.vcxproj
index 99a45e47..e7a21161 100644
--- a/expat/lib/expatw_static.vcxproj
+++ b/expat/lib/expatw_static.vcxproj
@@ -120,6 +120,7 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c" />
     <ClCompile Include="xmlparse.c" />
     <ClCompile Include="xmlrole.c" />
     <ClCompile Include="xmltok.c" />
diff --git a/expat/lib/expatw_static.vcxproj.filters b/expat/lib/expatw_static.vcxproj.filters
index 83a7c08c..724d9f8c 100644
--- a/expat/lib/expatw_static.vcxproj.filters
+++ b/expat/lib/expatw_static.vcxproj.filters
@@ -11,6 +11,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>