Macintosh-Tools/uvmac
1
0
Fork 0
mirror of https://github.com/InvisibleUp/uvmac.git synced 2024-11-25 11:31:18 +00:00
Code Issues Projects Releases Wiki Activity

Move UI stuff into a subdirectory

Browse Source 
It seems that the resource file isn't ever attached to the EXE on Win32
This commit is contained in:
InvisibleUp 2020-02-10 23:12:22 -05:00
parent 824686b784
commit d01d2f9e09
44 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

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

1
cfg/main.rc
View File

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

2
src/ADBEMDEV.c
View File

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

2
src/ASCEMDEV.c
View File

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

2
src/DISAM68K.c
View File

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

2
src/GLOBGLUE.c
View File

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

2
src/IWMEMDEV.c
View File

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

2
src/KBRDEMDV.c
View File

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

2
src/M68KITAB.c
View File

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

2
src/MINEM68K.c
View File

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

2
src/MOUSEMDV.c
View File

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

2
src/PMUEMDEV.c
View File

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

2
src/PROGMAIN.c
View File

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

2
src/ROMEMDEV.c
View File

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

2
src/RTCEMDEV.c
View File

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

2
src/SCCEMDEV.c
View File

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

2
src/SCRNEMDV.c
View File

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

2
src/SCSIEMDV.c
View File

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

2
src/SNDEMDEV.c
View File

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

2
src/SONYEMDV.c
View File

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

0
src/ICONAPPO.icns → src/UI/MACOSX/ICONAPPO.icns
View File

0
src/ICONDSKO.icns → src/UI/MACOSX/ICONDSKO.icns
View File

0
src/ICONROMO.icns → src/UI/MACOSX/ICONROMO.icns
View File

2
src/OSGLUOSX.c → src/UI/MACOSX/OSGLUOSX.c
View File

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

0
src/MYOSGLUE.h → src/UI/MYOSGLUE.h
View File

0
src/ICONAPPM.r → src/UI/OLDMAC/ICONAPPM.r
View File

0
src/ICONDSKM.r → src/UI/OLDMAC/ICONDSKM.r
View File

0
src/ICONROMM.r → src/UI/OLDMAC/ICONROMM.r
View File

2
src/OSGLUMAC.c → src/UI/OLDMAC/OSGLUMAC.c
View File

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

0
src/main.r → src/UI/OLDMAC/main.r
View File

2
src/OSGLUCCO.m → src/UI/OSGLUCCO.m
View File

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

2
src/OSGLUNDS.c → src/UI/OSGLUNDS.c
View File

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

2
src/OSGLUXWN.c → src/UI/UNIX/OSGLUXWN.c
View File

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

0
src/ICONAPPW.ico → src/UI/WIN32/ICONAPPW.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
src/ICONDSKW.ico → src/UI/WIN32/ICONDSKW.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
src/ICONROMW.ico → src/UI/WIN32/ICONROMW.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

2
src/OSGLUWIN.c → src/UI/WIN32/OSGLUWIN.c
View File

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

1
src/UI/WIN32/main.rc Normal file
View File

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

2
src/OSGLUGTK.c → src/UI/XPLAT/OSGLUGTK.c
View File

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

2
src/OSGLUSD2.c → src/UI/XPLAT/OSGLUSD2.c
View File

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

2
src/OSGLUSDL.c → src/UI/XPLAT/OSGLUSDL.c
View File

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

2
src/VIA2EMDV.c
View File

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

2
src/VIAEMDEV.c
View File

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

2
src/VIDEMDEV.c
View File

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