Move UI stuff into a subdirectory

It seems that the resource file isn't ever attached to the EXE on Win32

Makefile

@@ -8,8 +8,8 @@ mk_COptions = $(mk_COptionsCommon) -Os
 
 TheDefaultOutput : minivmac.exe
 
-bld/OSGLUWIN.o : src/OSGLUWIN.c src/STRCNENG.h cfg/STRCONST.h src/INTLCHAR.h src/COMOSGLU.h src/CONTROLM.h cfg/CNFGGLOB.h
-	gcc "src/OSGLUWIN.c" -o "bld/OSGLUWIN.o" $(mk_COptions)
+bld/OSGLUWIN.o : src/UI/WIN32/OSGLUWIN.c src/STRCNENG.h cfg/STRCONST.h src/INTLCHAR.h src/COMOSGLU.h src/CONTROLM.h cfg/CNFGGLOB.h
+	gcc "src/UI/WIN32/OSGLUWIN.c" -o "bld/OSGLUWIN.o" $(mk_COptions)
 bld/GLOBGLUE.o : src/GLOBGLUE.c cfg/CNFGGLOB.h
 	gcc "src/GLOBGLUE.c" -o "bld/GLOBGLUE.o" $(mk_COptions)
 bld/M68KITAB.o : src/M68KITAB.c cfg/CNFGGLOB.h
@@ -60,8 +60,8 @@ ObjFiles = \
 	bld/PROGMAIN.o \
 
 
-bld/: cfg/main.rc
-	windres.exe -i "cfg/main.rc" --input-format=rc -o "bld/" -O coff  --include-dir SRC
+bld/main.res: src/UI/WIN32/main.rc
+	windres.exe -i "src/UI/WIN32/main.rc" --input-format=rc -o "bld/main.res" -O coff  --include-dir SRC
 
 
 minivmac.exe : $(ObjFiles) bld/

cfg/main.rc

@@ -1 +0,0 @@
-256                     ICON    DISCARDABLE     "ICONAPPW.ico"

src/ADBEMDEV.c

@@ -20,7 +20,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif

src/ASCEMDEV.c

@@ -21,7 +21,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "VIAEMDEV.h"

src/DISAM68K.c

@@ -22,7 +22,7 @@
 #include "SYSDEPNS.h"
 
 #include "ENDIANAC.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 

src/GLOBGLUE.c

@@ -27,7 +27,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #endif

src/IWMEMDEV.c

@@ -32,7 +32,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif

src/KBRDEMDV.c

@@ -24,7 +24,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif

src/M68KITAB.c

@@ -22,7 +22,7 @@
 #include "SYSDEPNS.h"
 #endif
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 

src/MINEM68K.c

@@ -33,7 +33,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"

src/MOUSEMDV.c

@@ -25,7 +25,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"

src/PMUEMDEV.c

@@ -20,7 +20,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "VIAEMDEV.h"

src/PROGMAIN.c

@@ -21,7 +21,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "M68KITAB.h"

src/ROMEMDEV.c

@@ -27,7 +27,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"

src/RTCEMDEV.c

@@ -24,7 +24,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"

src/SCCEMDEV.c

@@ -41,7 +41,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif

src/SCRNEMDV.c

@@ -26,7 +26,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"

src/SCSIEMDV.c

@@ -28,7 +28,7 @@
 #include "SYSDEPNS.h"
 
 #include "ENDIANAC.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "MINEM68K.h"

src/SNDEMDEV.c

@@ -25,7 +25,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "MINEM68K.h"

src/SONYEMDV.c

@@ -30,7 +30,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"

src/UI/MACOSX/OSGLUOSX.c

@@ -31,7 +31,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 /* --- adapting to API/ABI version differences --- */
 

src/UI/OLDMAC/OSGLUMAC.c

@@ -36,7 +36,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 

src/UI/OSGLUCCO.m

@@ -28,7 +28,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 

src/UI/OSGLUNDS.c

@@ -22,7 +22,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 

src/UI/UNIX/OSGLUXWN.c

@@ -39,7 +39,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 

src/UI/WIN32/OSGLUWIN.c

@@ -32,7 +32,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 
 /* --- adapting to API/ABI version differences --- */

src/UI/WIN32/main.rc

@@ -0,0 +1 @@
+256                     ICON    DISCARDABLE     "src/UI/WIN32/ICONAPPW.ico"

src/UI/XPLAT/OSGLUGTK.c

@@ -25,7 +25,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 

src/UI/XPLAT/OSGLUSD2.c

@@ -25,7 +25,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 

src/UI/XPLAT/OSGLUSDL.c

@@ -25,7 +25,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 

src/VIA2EMDV.c

@@ -25,7 +25,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif

src/VIAEMDEV.c

@@ -25,7 +25,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif

src/VIDEMDEV.c

@@ -29,7 +29,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"