Move UI stuff into a subdirectory

It seems that the resource file isn't ever attached to the EXE on Win32
2024-11-28 15:50:11 +00:00 · 2020-02-10 23:12:22 -05:00 · 2020-02-10 23:12:22 -05:00 · d01d2f9e09
commit d01d2f9e09
parent 824686b784
44 changed files with 35 additions and 35 deletions
--- a/8
+++ b/8
@ -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/
--- a/cfg/main.rc
+++ b/cfg/main.rc
@ -1 +0,0 @@
-256                     ICON    DISCARDABLE     "ICONAPPW.ico"
--- a/src/ADBEMDEV.c
+++ b/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
--- a/src/ASCEMDEV.c
+++ b/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"
--- a/src/DISAM68K.c
+++ b/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"

--- a/src/GLOBGLUE.c
+++ b/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
--- a/src/IWMEMDEV.c
+++ b/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
--- a/src/KBRDEMDV.c
+++ b/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
--- a/src/M68KITAB.c
+++ b/src/M68KITAB.c
@ -22,7 +22,7 @@
 #include "SYSDEPNS.h"
 #endif

-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"

--- a/src/MINEM68K.c
+++ b/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"
--- a/src/MOUSEMDV.c
+++ b/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"
--- a/src/PMUEMDEV.c
+++ b/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"
--- a/src/PROGMAIN.c
+++ b/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"
--- a/src/ROMEMDEV.c
+++ b/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"
--- a/src/RTCEMDEV.c
+++ b/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"
--- a/src/SCCEMDEV.c
+++ b/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
--- a/src/SCRNEMDV.c
+++ b/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"
--- a/src/SCSIEMDV.c
+++ b/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"
--- a/src/SNDEMDEV.c
+++ b/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"
--- a/src/SONYEMDV.c
+++ b/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"
--- a/src/UI/MACOSX/ICONAPPO.icns
+++ b/src/UI/MACOSX/ICONAPPO.icns
--- a/src/UI/MACOSX/ICONDSKO.icns
+++ b/src/UI/MACOSX/ICONDSKO.icns
--- a/src/UI/MACOSX/ICONROMO.icns
+++ b/src/UI/MACOSX/ICONROMO.icns
--- a/src/UI/MACOSX/OSGLUOSX.c
+++ b/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 --- */

--- a/src/UI/MYOSGLUE.h
+++ b/src/UI/MYOSGLUE.h
--- a/src/UI/OLDMAC/ICONAPPM.r
+++ b/src/UI/OLDMAC/ICONAPPM.r
--- a/src/UI/OLDMAC/ICONDSKM.r
+++ b/src/UI/OLDMAC/ICONDSKM.r
--- a/src/UI/OLDMAC/ICONROMM.r
+++ b/src/UI/OLDMAC/ICONROMM.r
--- a/src/UI/OLDMAC/OSGLUMAC.c
+++ b/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"

--- a/src/UI/OLDMAC/main.r
+++ b/src/UI/OLDMAC/main.r
--- a/src/UI/OSGLUCCO.m
+++ b/src/UI/OSGLUCCO.m
@ -28,7 +28,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"

-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"

 #include "STRCONST.h"

--- a/src/UI/OSGLUNDS.c
+++ b/src/UI/OSGLUNDS.c
@ -22,7 +22,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"

-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"

 #include "STRCONST.h"

--- a/src/UI/UNIX/OSGLUXWN.c
+++ b/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"

--- a/src/UI/WIN32/ICONAPPW.ico
+++ b/src/UI/WIN32/ICONAPPW.ico
--- a/src/UI/WIN32/ICONDSKW.ico
+++ b/src/UI/WIN32/ICONDSKW.ico
--- a/src/UI/WIN32/ICONROMW.ico
+++ b/src/UI/WIN32/ICONROMW.ico
--- a/src/UI/WIN32/OSGLUWIN.c
+++ b/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 --- */
--- a/src/UI/WIN32/main.rc
+++ b/src/UI/WIN32/main.rc
@ -0,0 +1 @@
+256                     ICON    DISCARDABLE     "src/UI/WIN32/ICONAPPW.ico"
--- a/src/UI/XPLAT/OSGLUGTK.c
+++ b/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"

--- a/src/UI/XPLAT/OSGLUSD2.c
+++ b/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"

--- a/src/UI/XPLAT/OSGLUSDL.c
+++ b/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"

--- a/src/VIA2EMDV.c
+++ b/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
--- a/src/VIAEMDEV.c
+++ b/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
--- a/src/VIDEMDEV.c
+++ b/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"
				`@ -0,0 +1 @@`
				`256 ICON DISCARDABLE "src/UI/WIN32/ICONAPPW.ico"`