rsvglibs: use OUT2INC

2 files changed, 218 insertions, 2 deletions

diff --git a/glib/glib-2.28.1-win32.patch b/glib/glib-2.28.1-win32.patch
index 3f2e45c55a9d..6e7c06d68465 100644
--- a/glib/glib-2.28.1-win32.patch
+++ b/glib/glib-2.28.1-win32.patch
@@ -622,7 +622,7 @@
  	gmarshal.strings \
  	gobject-query.exe \
  	libgobject-2.0-0.dll	\
-@@ -24,8 +23,11 @@
+@@ -24,8 +23,10 @@
  	testgobject.exe
  
  gobject_OBJECTS =		\
@@ -630,7 +630,6 @@
 +	gbinding.obj \
  	gboxed.obj		\
  	gclosure.obj		\
-+	gmarshal.obj              \
  	genums.obj		\
  	gobject.obj		\
  	gparam.obj		\
diff --git a/glib/makefile.mk b/glib/makefile.mk
index 747f1e71abfc..b2d266ce0f66 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -295,6 +295,223 @@ ADDITIONAL_FILES= config.h \
     gmodule/gmoduleconf.h
 
 BUILD_ACTION=nmake -f makefile.msc
+
+OUT2LIB+=gio/libgio-2.0-0.dll
+OUT2LIB+=glib/libglib-2.0-0.dll
+OUT2LIB+=gmodule/libgmodule-2.0-0.dll
+OUT2LIB+=gobject/libgobject-2.0-0.dll
+OUT2LIB+=gthread/libgthread-2.0-0.dll
+
+OUT2INC+=glib/glib.h
+OUT2INC+=glib/glib-object.h
+OUT2INC+=glib/glibconfig.h
+OUT2INC+=gmodule/gmodule.h
+
+OUT2INC+=gio/gdesktopappinfo.h
+OUT2INC+=gio/gunixcredentialsmessage.h
+OUT2INC+=gio/gunixinputstream.h
+OUT2INC+=gio/gunixsocketaddress.h
+OUT2INC+=gio/gfiledescriptorbased.h
+OUT2INC+=gio/gunixfdlist.h
+OUT2INC+=gio/gunixmounts.h
+OUT2INC+=gio/gunixconnection.h
+OUT2INC+=gio/gunixfdmessage.h
+OUT2INC+=gio/gunixoutputstream.h
+
+
+OUT2INC+=gio/gaction.h
+OUT2INC+=gio/gfileicon.h
+OUT2INC+=gio/gproxyaddressenumerator.h
+OUT2INC+=gio/gactiongroup.h
+OUT2INC+=gio/gfileinfo.h
+OUT2INC+=gio/gproxyresolver.h
+OUT2INC+=gio/gappinfo.h
+OUT2INC+=gio/gfileinputstream.h
+OUT2INC+=gio/gresolver.h
+OUT2INC+=gio/gapplication.h
+OUT2INC+=gio/gfileiostream.h
+OUT2INC+=gio/gseekable.h
+OUT2INC+=gio/gapplicationcommandline.h
+OUT2INC+=gio/gfilemonitor.h
+OUT2INC+=gio/gsettings.h
+OUT2INC+=gio/gasyncinitable.h
+OUT2INC+=gio/gfilenamecompleter.h
+OUT2INC+=gio/gsettingsbackend.h
+OUT2INC+=gio/gasyncresult.h
+OUT2INC+=gio/gfileoutputstream.h
+OUT2INC+=gio/gsimpleaction.h
+OUT2INC+=gio/gbufferedinputstream.h
+OUT2INC+=gio/gfilterinputstream.h
+OUT2INC+=gio/gsimpleactiongroup.h
+OUT2INC+=gio/gbufferedoutputstream.h
+OUT2INC+=gio/gfilteroutputstream.h
+OUT2INC+=gio/gsimpleasyncresult.h
+OUT2INC+=gio/gcancellable.h
+OUT2INC+=gio/gicon.h
+OUT2INC+=gio/gsimplepermission.h
+OUT2INC+=gio/gcharsetconverter.h
+OUT2INC+=gio/ginetaddress.h
+OUT2INC+=gio/gsocket.h
+OUT2INC+=gio/gcontenttype.h
+OUT2INC+=gio/ginetsocketaddress.h
+OUT2INC+=gio/gsocketaddress.h
+OUT2INC+=gio/gconverter.h
+OUT2INC+=gio/ginitable.h
+OUT2INC+=gio/gsocketaddressenumerator.h
+OUT2INC+=gio/gconverterinputstream.h
+OUT2INC+=gio/ginputstream.h
+OUT2INC+=gio/gsocketclient.h
+OUT2INC+=gio/gconverteroutputstream.h
+OUT2INC+=gio/gio.h
+OUT2INC+=gio/gsocketconnectable.h
+OUT2INC+=gio/gcredentials.h
+OUT2INC+=gio/gioenums.h
+OUT2INC+=gio/gsocketconnection.h
+OUT2INC+=gio/gdatainputstream.h
+OUT2INC+=gio/gioenumtypes.h
+OUT2INC+=gio/gsocketcontrolmessage.h
+OUT2INC+=gio/gdataoutputstream.h
+OUT2INC+=gio/gioerror.h
+OUT2INC+=gio/gsocketlistener.h
+OUT2INC+=gio/gdbusaddress.h
+OUT2INC+=gio/giomodule.h
+OUT2INC+=gio/gsocketservice.h
+OUT2INC+=gio/gdbusauthobserver.h
+OUT2INC+=gio/gioscheduler.h
+OUT2INC+=gio/gsrvtarget.h
+OUT2INC+=gio/gdbusconnection.h
+OUT2INC+=gio/giostream.h
+OUT2INC+=gio/gtcpconnection.h
+OUT2INC+=gio/gdbuserror.h
+OUT2INC+=gio/giotypes.h
+OUT2INC+=gio/gtcpwrapperconnection.h
+OUT2INC+=gio/gdbusintrospection.h
+OUT2INC+=gio/gloadableicon.h
+OUT2INC+=gio/gthemedicon.h
+OUT2INC+=gio/gdbusmessage.h
+OUT2INC+=gio/gmemoryinputstream.h
+OUT2INC+=gio/gthreadedsocketservice.h
+OUT2INC+=gio/gdbusmethodinvocation.h
+OUT2INC+=gio/gmemoryoutputstream.h
+OUT2INC+=gio/gtlsbackend.h
+OUT2INC+=gio/gdbusnameowning.h
+OUT2INC+=gio/gmount.h
+OUT2INC+=gio/gtlscertificate.h
+OUT2INC+=gio/gdbusnamewatching.h
+OUT2INC+=gio/gmountoperation.h
+OUT2INC+=gio/gtlsclientconnection.h
+OUT2INC+=gio/gdbusproxy.h
+OUT2INC+=gio/gnativevolumemonitor.h
+OUT2INC+=gio/gtlsconnection.h
+OUT2INC+=gio/gdbusserver.h
+OUT2INC+=gio/gnetworkaddress.h
+OUT2INC+=gio/gtlsserverconnection.h
+OUT2INC+=gio/gdbusutils.h
+OUT2INC+=gio/gnetworkservice.h
+OUT2INC+=gio/gvfs.h
+OUT2INC+=gio/gdrive.h
+OUT2INC+=gio/goutputstream.h
+OUT2INC+=gio/gvolume.h
+OUT2INC+=gio/gemblem.h
+OUT2INC+=gio/gpermission.h
+OUT2INC+=gio/gvolumemonitor.h
+OUT2INC+=gio/gemblemedicon.h
+OUT2INC+=gio/gpollableinputstream.h
+OUT2INC+=gio/gzlibcompressor.h
+OUT2INC+=gio/gfile.h
+OUT2INC+=gio/gpollableoutputstream.h
+OUT2INC+=gio/gzlibdecompressor.h
+OUT2INC+=gio/gfileattribute.h
+OUT2INC+=gio/gproxy.h
+OUT2INC+=gio/gfileenumerator.h
+OUT2INC+=gio/gproxyaddress.h
+
+OUT2INC+=glib/galloca.h
+OUT2INC+=glib/gconvert.h
+OUT2INC+=glib/gi18n.h
+OUT2INC+=glib/goption.h
+OUT2INC+=glib/gscanner.h
+OUT2INC+=glib/gthreadpool.h
+OUT2INC+=glib/garray.h
+OUT2INC+=glib/gdataset.h
+OUT2INC+=glib/giochannel.h
+OUT2INC+=glib/gpattern.h
+OUT2INC+=glib/gsequence.h
+OUT2INC+=glib/gtimer.h
+OUT2INC+=glib/gasyncqueue.h
+OUT2INC+=glib/gdate.h
+OUT2INC+=glib/gkeyfile.h
+OUT2INC+=glib/gpoll.h
+OUT2INC+=glib/gshell.h
+OUT2INC+=glib/gtimezone.h
+OUT2INC+=glib/gatomic.h
+OUT2INC+=glib/gdatetime.h
+OUT2INC+=glib/glist.h
+OUT2INC+=glib/gprimes.h
+OUT2INC+=glib/gslice.h
+OUT2INC+=glib/gtree.h
+OUT2INC+=glib/gbacktrace.h
+OUT2INC+=glib/gdir.h
+OUT2INC+=glib/gmacros.h
+OUT2INC+=glib/gprintf.h
+OUT2INC+=glib/gslist.h
+OUT2INC+=glib/gtypes.h
+OUT2INC+=glib/gbase64.h
+OUT2INC+=glib/gerror.h
+OUT2INC+=glib/gmain.h
+OUT2INC+=glib/gqsort.h
+OUT2INC+=glib/gspawn.h
+OUT2INC+=glib/gunicode.h
+OUT2INC+=glib/gbitlock.h
+OUT2INC+=glib/gfileutils.h
+OUT2INC+=glib/gmappedfile.h
+OUT2INC+=glib/gquark.h
+OUT2INC+=glib/gstdio.h
+OUT2INC+=glib/gurifuncs.h
+OUT2INC+=glib/gbookmarkfile.h
+OUT2INC+=glib/ghash.h
+OUT2INC+=glib/gmarkup.h
+OUT2INC+=glib/gqueue.h
+OUT2INC+=glib/gstrfuncs.h
+OUT2INC+=glib/gutils.h
+OUT2INC+=glib/gcache.h
+OUT2INC+=glib/ghook.h
+OUT2INC+=glib/gmem.h
+OUT2INC+=glib/grand.h
+OUT2INC+=glib/gstring.h
+OUT2INC+=glib/gvariant.h
+OUT2INC+=glib/gchecksum.h
+OUT2INC+=glib/ghostutils.h
+OUT2INC+=glib/gmessages.h
+OUT2INC+=glib/gregex.h
+OUT2INC+=glib/gtestutils.h
+OUT2INC+=glib/gvarianttype.h
+OUT2INC+=glib/gcompletion.h
+OUT2INC+=glib/gi18n-lib.h
+OUT2INC+=glib/gnode.h
+OUT2INC+=glib/grel.h
+OUT2INC+=glib/gthread.h
+OUT2INC+=glib/gwin32.h
+
+
+OUT2INC+=gobject/gbinding.h
+OUT2INC+=gobject/gmarshal.h
+OUT2INC+=gobject/gparamspecs.h
+OUT2INC+=gobject/gtypemodule.h
+OUT2INC+=gobject/gvaluecollector.h
+OUT2INC+=gobject/gboxed.h
+OUT2INC+=gobject/gobject.h
+OUT2INC+=gobject/gsignal.h
+OUT2INC+=gobject/gtypeplugin.h
+OUT2INC+=gobject/gvaluetypes.h
+OUT2INC+=gobject/gclosure.h
+OUT2INC+=gobject/gobjectnotifyqueue.c  
+OUT2INC+=gobject/gsourceclosure.h
+OUT2INC+=gobject/gvalue.h
+OUT2INC+=gobject/genums.h
+OUT2INC+=gobject/gparam.h
+OUT2INC+=gobject/gtype.h
+OUT2INC+=gobject/gvaluearray.h
 .ELSE
 .ENDIF