Macintosh-Tools
/
uvmac
mirror of https://github.com/InvisibleUp/uvmac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix CMake build for SONY.bin, Windows resource file

This commit is contained in:
InvisibleUp 2020-05-25 13:17:12 -04:00
parent a310fbf313
commit 306347d6c2
6 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -170,18 +170,14 @@ add_library(
src/UI/WIN32/OSGLUWIN.c
src/UI/WIN32/SOUND.c
src/UI/WIN32/TIMEDATE.c
# src/UI/WIN32/main.rc
# src/UI/WIN32/ICONAPPW.ico
# src/UI/WIN32/ICONDSKW.ico
# src/UI/WIN32/ICONROMW.ico
src/UI/WIN32/main.rc
)
target_include_directories(ui_win32 PRIVATE cfg/ src/)
target_include_directories(ui_win32 PRIVATE src/UI/ src/UI/WIN32/)
configure_file(src/UI/WIN32/ICONAPPW.ico ICONAPPW.ico COPYONLY)
configure_file(src/UI/WIN32/ICONDSKW.ico ICONDSKW.ico COPYONLY)
configure_file(src/UI/WIN32/ICONROMW.ico ICONROMW.ico COPYONLY)
target_link_libraries(ui_win32 PUBLIC winmm ole32 uuid)
#set_source_files_properties(src/UI/WIN32/main.rc PROPERTIES LANGUAGE RC)
#set_source_files_properties(src/UI/WIN32/ICONAPPW.ico PROPERTIES EXTERNAL_OBJECT True)
#set_source_files_properties(src/UI/WIN32/ICONDSKW.ico PROPERTIES EXTERNAL_OBJECT True)
#set_source_files_properties(src/UI/WIN32/ICONROMW.ico PROPERTIES EXTERNAL_OBJECT True)
#add_library(
# ui_sdl2 OBJECT
@ -194,7 +190,7 @@ target_link_libraries(ui_win32 PUBLIC winmm ole32 uuid)
## Final compiled program definition
add_executable(
microvmac
microvmac WIN32
src/PROGMAIN.c
src/GLOBGLUE.c
src/PATCHES/ROMEMDEV.c
@ -204,6 +200,7 @@ target_include_directories(microvmac PRIVATE cfg/ src/)
set_target_properties(microvmac PROPERTIES C_STANDARD 99 C_STANDARD_REQUIRED True)
#target_link_libraries(microvmac INTERFACE tgt_macplus) # temporary
target_link_libraries(microvmac PRIVATE incbin ui_win32)
configure_file(src/PATCHES/SONY.bin SONY.bin COPYONLY)
# temporary, because "INTERFACE" isn't working how I expect it to
target_link_libraries(

2
cfg/CNFGGLOB.h
View File

@ -10,7 +10,7 @@
#include <stdint.h>
#define MayInline inline __attribute__((always_inline))
#define MayInline inline
#define SmallGlobals 0
#define cIncludeUnused 0
#define UnusedParam(p) (void) p

2
src/PATCHES/ROMEMDEV.c
View File

@ -50,7 +50,7 @@
Replacement for .Sony driver
68k machine code, compiled from mydriver.a
*/
INCBIN(SonyDriver, "src/PATCHES/SONY.bin");
INCBIN(SonyDriver, "SONY.bin");
#endif
#if UseSonyPatch

12
src/PROGMAIN.c
View File

@ -216,7 +216,7 @@ const DevMethods_t DEVICES[] = {
.timeend = NULL,
},
// ADB
{
/*{
.init = NULL,
.reset = NULL,
.starttick = EmADB ? ADB_Update : NULL,
@ -224,7 +224,7 @@ const DevMethods_t DEVICES[] = {
.subtick = NULL,
.timebegin = NULL,
.timeend = NULL,
},
},*/
// LocalTalk
/*{
.init = NULL,
@ -235,7 +235,7 @@ const DevMethods_t DEVICES[] = {
.timeend = NULL,
},*/
// Video card
{
/*{
.init = EmVidCard ? Vid_Init : NULL,
.reset = NULL,
.starttick = EmVidCard ? Vid_Update : NULL,
@ -243,7 +243,7 @@ const DevMethods_t DEVICES[] = {
.subtick = NULL,
.timebegin = NULL,
.timeend = NULL,
},
},*/
// ASC
{
.init = NULL,
@ -347,7 +347,7 @@ LOCALPROC SixtiethSecondNotify(void)
Mouse_Update();
InterruptReset_Update();
if (EmClassicKbrd) { KeyBoard_Update(); }
if (EmADB) { ADB_Update(); }
//if (EmADB) { ADB_Update(); }
Sixtieth_PulseNtfy(); /* Vertical Blanking Interrupt */
Sony_Update();
@ -356,7 +356,7 @@ LOCALPROC SixtiethSecondNotify(void)
LocalTalkTick();
#endif
if (EmRTC) { RTC_Interrupt(); }
if (EmVidCard) { Vid_Update(); }
//if (EmVidCard) { Vid_Update(); }
SubTickTaskStart();
}

4
src/UI/CONTROLM.c
View File

@ -490,10 +490,6 @@ LOCALPROC SetSpeedValue(uint8_t i)
ControlMessage = kCntrlMsgNewSpeed;
}
#if 1
FORWARDPROC ToggleWantFullScreen(void);
#endif
#if IncludeHostTextClipExchange
LOCALPROC HTCEexportSubstCStr(char *s)
{

2
src/UI/WIN32/main.rc
View File

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