mirror of
https://github.com/InvisibleUp/uvmac.git
synced 2024-11-25 11:31:18 +00:00
Fix CMake build for SONY.bin, Windows resource file
This commit is contained in:
parent
a310fbf313
commit
306347d6c2
@ -170,18 +170,14 @@ add_library(
|
|||||||
src/UI/WIN32/OSGLUWIN.c
|
src/UI/WIN32/OSGLUWIN.c
|
||||||
src/UI/WIN32/SOUND.c
|
src/UI/WIN32/SOUND.c
|
||||||
src/UI/WIN32/TIMEDATE.c
|
src/UI/WIN32/TIMEDATE.c
|
||||||
# src/UI/WIN32/main.rc
|
src/UI/WIN32/main.rc
|
||||||
# src/UI/WIN32/ICONAPPW.ico
|
|
||||||
# src/UI/WIN32/ICONDSKW.ico
|
|
||||||
# src/UI/WIN32/ICONROMW.ico
|
|
||||||
)
|
)
|
||||||
target_include_directories(ui_win32 PRIVATE cfg/ src/)
|
target_include_directories(ui_win32 PRIVATE cfg/ src/)
|
||||||
target_include_directories(ui_win32 PRIVATE src/UI/ src/UI/WIN32/)
|
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)
|
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(
|
#add_library(
|
||||||
# ui_sdl2 OBJECT
|
# ui_sdl2 OBJECT
|
||||||
@ -194,7 +190,7 @@ target_link_libraries(ui_win32 PUBLIC winmm ole32 uuid)
|
|||||||
## Final compiled program definition
|
## Final compiled program definition
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
microvmac
|
microvmac WIN32
|
||||||
src/PROGMAIN.c
|
src/PROGMAIN.c
|
||||||
src/GLOBGLUE.c
|
src/GLOBGLUE.c
|
||||||
src/PATCHES/ROMEMDEV.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)
|
set_target_properties(microvmac PROPERTIES C_STANDARD 99 C_STANDARD_REQUIRED True)
|
||||||
#target_link_libraries(microvmac INTERFACE tgt_macplus) # temporary
|
#target_link_libraries(microvmac INTERFACE tgt_macplus) # temporary
|
||||||
target_link_libraries(microvmac PRIVATE incbin ui_win32)
|
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
|
# temporary, because "INTERFACE" isn't working how I expect it to
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#define MayInline inline __attribute__((always_inline))
|
#define MayInline inline
|
||||||
#define SmallGlobals 0
|
#define SmallGlobals 0
|
||||||
#define cIncludeUnused 0
|
#define cIncludeUnused 0
|
||||||
#define UnusedParam(p) (void) p
|
#define UnusedParam(p) (void) p
|
||||||
|
@ -50,7 +50,7 @@
|
|||||||
Replacement for .Sony driver
|
Replacement for .Sony driver
|
||||||
68k machine code, compiled from mydriver.a
|
68k machine code, compiled from mydriver.a
|
||||||
*/
|
*/
|
||||||
INCBIN(SonyDriver, "src/PATCHES/SONY.bin");
|
INCBIN(SonyDriver, "SONY.bin");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UseSonyPatch
|
#if UseSonyPatch
|
||||||
|
@ -216,7 +216,7 @@ const DevMethods_t DEVICES[] = {
|
|||||||
.timeend = NULL,
|
.timeend = NULL,
|
||||||
},
|
},
|
||||||
// ADB
|
// ADB
|
||||||
{
|
/*{
|
||||||
.init = NULL,
|
.init = NULL,
|
||||||
.reset = NULL,
|
.reset = NULL,
|
||||||
.starttick = EmADB ? ADB_Update : NULL,
|
.starttick = EmADB ? ADB_Update : NULL,
|
||||||
@ -224,7 +224,7 @@ const DevMethods_t DEVICES[] = {
|
|||||||
.subtick = NULL,
|
.subtick = NULL,
|
||||||
.timebegin = NULL,
|
.timebegin = NULL,
|
||||||
.timeend = NULL,
|
.timeend = NULL,
|
||||||
},
|
},*/
|
||||||
// LocalTalk
|
// LocalTalk
|
||||||
/*{
|
/*{
|
||||||
.init = NULL,
|
.init = NULL,
|
||||||
@ -235,7 +235,7 @@ const DevMethods_t DEVICES[] = {
|
|||||||
.timeend = NULL,
|
.timeend = NULL,
|
||||||
},*/
|
},*/
|
||||||
// Video card
|
// Video card
|
||||||
{
|
/*{
|
||||||
.init = EmVidCard ? Vid_Init : NULL,
|
.init = EmVidCard ? Vid_Init : NULL,
|
||||||
.reset = NULL,
|
.reset = NULL,
|
||||||
.starttick = EmVidCard ? Vid_Update : NULL,
|
.starttick = EmVidCard ? Vid_Update : NULL,
|
||||||
@ -243,7 +243,7 @@ const DevMethods_t DEVICES[] = {
|
|||||||
.subtick = NULL,
|
.subtick = NULL,
|
||||||
.timebegin = NULL,
|
.timebegin = NULL,
|
||||||
.timeend = NULL,
|
.timeend = NULL,
|
||||||
},
|
},*/
|
||||||
// ASC
|
// ASC
|
||||||
{
|
{
|
||||||
.init = NULL,
|
.init = NULL,
|
||||||
@ -347,7 +347,7 @@ LOCALPROC SixtiethSecondNotify(void)
|
|||||||
Mouse_Update();
|
Mouse_Update();
|
||||||
InterruptReset_Update();
|
InterruptReset_Update();
|
||||||
if (EmClassicKbrd) { KeyBoard_Update(); }
|
if (EmClassicKbrd) { KeyBoard_Update(); }
|
||||||
if (EmADB) { ADB_Update(); }
|
//if (EmADB) { ADB_Update(); }
|
||||||
|
|
||||||
Sixtieth_PulseNtfy(); /* Vertical Blanking Interrupt */
|
Sixtieth_PulseNtfy(); /* Vertical Blanking Interrupt */
|
||||||
Sony_Update();
|
Sony_Update();
|
||||||
@ -356,7 +356,7 @@ LOCALPROC SixtiethSecondNotify(void)
|
|||||||
LocalTalkTick();
|
LocalTalkTick();
|
||||||
#endif
|
#endif
|
||||||
if (EmRTC) { RTC_Interrupt(); }
|
if (EmRTC) { RTC_Interrupt(); }
|
||||||
if (EmVidCard) { Vid_Update(); }
|
//if (EmVidCard) { Vid_Update(); }
|
||||||
|
|
||||||
SubTickTaskStart();
|
SubTickTaskStart();
|
||||||
}
|
}
|
||||||
|
@ -490,10 +490,6 @@ LOCALPROC SetSpeedValue(uint8_t i)
|
|||||||
ControlMessage = kCntrlMsgNewSpeed;
|
ControlMessage = kCntrlMsgNewSpeed;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 1
|
|
||||||
FORWARDPROC ToggleWantFullScreen(void);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if IncludeHostTextClipExchange
|
#if IncludeHostTextClipExchange
|
||||||
LOCALPROC HTCEexportSubstCStr(char *s)
|
LOCALPROC HTCEexportSubstCStr(char *s)
|
||||||
{
|
{
|
||||||
|
@ -1 +1 @@
|
|||||||
256 ICON DISCARDABLE "src/UI/WIN32/ICONAPPW.ico"
|
256 ICON DISCARDABLE "ICONAPPW.ico"
|
||||||
|
Loading…
Reference in New Issue
Block a user