ooo340libs: needed patch changes for external libraries/using external/jpeg*.h again

glib/makefile.mk

@@ -289,21 +289,24 @@ OUT2INC+=gobject/gvaluearray.h
 .ELIF "$(OS)"=="WNT"
 CONVERTFILES=gobject/gmarshal.c
 
-PATCH_FILES=glib-2.28.1-win32.patch
+PATCH_FILES=glib-2.28.1-win32.patch glib-2.28.1-win32-2.patch
 CONFIGURE_ACTION=
 ADDITIONAL_FILES= config.h \
     gio/gvdb/makefile.msc \
     gio/win32/makefile.msc \
     glib/glibconfig.h \
-    gmodule/gmoduleconf.h
+    gmodule/gmoduleconf.h \
+    gobject/glib-mkenums
 
 BUILD_ACTION=nmake -f makefile.msc
 
-OUT2BIN+=gio/libgio-2.0-0.dll
-OUT2BIN+=glib/libglib-2.0-0.dll
-OUT2BIN+=gmodule/libgmodule-2.0-0.dll
-OUT2BIN+=gobject/libgobject-2.0-0.dll
-OUT2BIN+=gthread/libgthread-2.0-0.dll
+OUT2BIN+=gio$/libgio-2.0-0.dll
+OUT2BIN+=glib$/libglib-2.0-0.dll
+OUT2BIN+=gmodule$/libgmodule-2.0-0.dll
+OUT2BIN+=gobject$/libgobject-2.0-0.dll
+OUT2BIN+=gthread$/libgthread-2.0-0.dll
+OUT2BIN+=gobject$/glib-mkenums
+OUT2BIN+=gobject$/glib-genmarshal.exe
 
 OUT2LIB+=build/win32/dirent/dirent.lib
 OUT2LIB+=gio/gio-2.0.lib
@@ -318,6 +321,8 @@ OUT2LIB+=gobject/glib-genmarshal.lib
 OUT2LIB+=gobject/gobject-2.0.lib
 OUT2LIB+=gthread/gthread-2.0.lib
 
+OUT2INC+=build$/win32$/make.msc
+OUT2INC+=build$/win32$/module.defs
 
 OUT2INC+=glib/glib.h
 OUT2INC+=glib/glib-object.h

glib/prj/d.lst

@@ -12,6 +12,7 @@ symlink: %_DEST%\lib%_EXT%\libgobject-2.0.0.dylib %_DEST%\lib%_EXT%\libgobject-2
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
 ..\%__SRC%\bin\glib-mkenums %_DEST%\bin%_EXT%\glib-mkenums
 ..\%__SRC%\bin\glib-genmarshal %_DEST%\bin%_EXT%\glib-genmarshal
+..\%__SRC%\bin\glib-genmarshal.exe %_DEST%\bin%_EXT%\glib-genmarshal.exe
 ..\%__SRC%\lib\gio-2.0.lib %_DEST%\lib%_EXT%\gio-2.0.lib
 ..\%__SRC%\lib\gmodule-2.0.lib %_DEST%\lib%_EXT%\gmodule-2.0.lib
 ..\%__SRC%\lib\gthread-2.0.lib %_DEST%\lib%_EXT%\gthread-2.0.lib
@@ -36,6 +37,8 @@ mkdir: %_DEST%\inc%_EXT%\external\glib-2.0
 ..\%__SRC%\inc\glib.h %_DEST%\inc%_EXT%\external\glib-2.0\glib.h
 ..\%__SRC%\inc\glibconfig.h %_DEST%\inc%_EXT%\external\glib-2.0\glibconfig.h
 ..\%__SRC%\inc\gmodule.h %_DEST%\inc%_EXT%\external\glib-2.0\gmodule.h
+..\%__SRC%\inc\make.msc %_DEST%\inc%_EXT%\external\glib-2.0\make.msc
+..\%__SRC%\inc\module.defs %_DEST%\inc%_EXT%\external\glib-2.0\module.defs
 
 mkdir: %_DEST%\inc%_EXT%\external\glib-2.0\gio
 ..\%__SRC%\inc\gaction.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gaction.h

pango/makefile.mk

@@ -108,7 +108,7 @@ OUT2INC+=pango/pango-utils.h
 .ELIF "$(OS)"=="WNT"
 
 PATCH_FILES=pango-1.28.3-win32.patch
-ADDITIONAL_FILES=config.h module.defs make.msc glib-mkenums.pl msvc_recommended_pragmas.h
+ADDITIONAL_FILES=config.h msvc_recommended_pragmas.h
 CONFIGURE_DIR=
 CONFIGURE_ACTION=
 BUILD_DIR=./pango