Relocate the headers from Wine, add two new ones

external/prj/build.lst

@@ -4,4 +4,4 @@ el	external\glibc		nmake	-	all	el_glibc NULL
 el	external\gcc3_specific	nmake	-	all	el_gcc3 NULL
 el	external\mingwheaders		nmake	-	w	el_mingwheaders NULL
 el	external\jawt		nmake	-	w	el_jawt NULL
-el	external\gdiplus	nmake	-	w	el_gdiplus NULL
+el	external\wine		nmake	-	w	el_wine NULL

external/prj/d.lst

 mkdir: %_DEST%\inc\external
 mkdir: %_DEST%\inc\external\glibc
-mkdir: %_DEST%\inc\external\gdiplus
 mkdir: %_DEST%\inc\external\mingw
 mkdir: %_DEST%\inc\external\mingw\include
 mkdir: %_DEST%\inc\external\mingw\include\atl
 mkdir: %_DEST%\inc\external\mingw\include\sys
+mkdir: %_DEST%\inc\external\wine
 
 ..\glibc\rtufiles\config.h %_DEST%\inc\external\glibc\config.h
 ..\glibc\rtufiles\getopt.h %_DEST%\inc\external\glibc\getopt.h
@@ -15,7 +15,7 @@ mkdir: %_DEST%\inc\external\mingw\include\sys
 
 ..\%__SRC%\inc\*.h %_DEST%\inc\external\glibc\*.h
 
-..\%__SRC%\inc\gdiplus\*.h %_DEST%\inc\external\gdiplus\*.h
+..\%__SRC%\inc\wine\*.h %_DEST%\inc\external\wine\*.h
 
 ..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc\external\mingw\include\*
 ..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc\external\mingw\include\atl\*

external/gdiplus/makefile.mk → external/wine/makefile.mk

@@ -32,8 +32,8 @@ TARGET=gdiplus
 .IF "$(OS)$(COM)" == "WNTGCC"
 
 ALL:
-    -$(MKDIRHIER) $(OUT)/inc/gdiplus
-    cp include/* $(OUT)/inc/gdiplus
+    -$(MKDIRHIER) $(OUT)/inc/wine
+    cp include/* $(OUT)/inc/wine
     $(DLLTOOL) --input-def lib/gdiplus.def --dllname=gdiplus.dll --output-lib=$(OUT)/lib/libgdiplus.dll.a
 
 .ENDIF