From 8f122f65991167e4245794a0bf6a1d28b9b5d052 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Mon, 1 Apr 2024 17:05:56 +0200 Subject: [PATCH] I Made it build in Android Studio in Linux --- app/build.gradle | 1 + app/src/main/cpp/core/apple.c | 6 +++--- app/src/main/cpp/core/cursor.c | 2 +- app/src/main/cpp/core/ddeserv.c | 2 +- app/src/main/cpp/core/debugdll.c | 4 ++-- app/src/main/cpp/core/debugger.c | 4 ++-- app/src/main/cpp/core/disasm.c | 2 +- app/src/main/cpp/core/dismem.c | 2 +- app/src/main/cpp/core/display.c | 2 +- app/src/main/cpp/core/disrpl.c | 2 +- app/src/main/cpp/core/{Emu48.c => emu48.c} | 4 ++-- app/src/main/cpp/core/{Emu48.h => emu48.h} | 2 +- app/src/main/cpp/core/emu48dll.c | 2 +- app/src/main/cpp/core/engine.c | 6 +++--- app/src/main/cpp/core/external.c | 2 +- app/src/main/cpp/core/fetch.c | 2 +- app/src/main/cpp/core/files.c | 2 +- app/src/main/cpp/core/i28f160.c | 2 +- app/src/main/cpp/core/keyboard.c | 2 +- app/src/main/cpp/core/keymacro.c | 2 +- app/src/main/cpp/core/kml.c | 2 +- app/src/main/cpp/core/lowbat.c | 2 +- app/src/main/cpp/core/mops.c | 2 +- app/src/main/cpp/core/mru.c | 2 +- app/src/main/cpp/core/opcodes.c | 6 +++--- app/src/main/cpp/core/{Opcodes.h => opcodes.h} | 0 app/src/main/cpp/core/redeye.c | 2 +- app/src/main/cpp/core/romcrc.c | 2 +- app/src/main/cpp/core/rpl.c | 2 +- app/src/main/cpp/core/serial.c | 2 +- app/src/main/cpp/core/settings.c | 2 +- app/src/main/cpp/core/sndenum.c | 2 +- app/src/main/cpp/core/sound.c | 2 +- app/src/main/cpp/core/stack.c | 2 +- app/src/main/cpp/core/symbfile.c | 2 +- app/src/main/cpp/core/timer.c | 2 +- app/src/main/cpp/core/udp.c | 2 +- app/src/main/cpp/emu.h | 2 +- gradlew | 0 39 files changed, 46 insertions(+), 45 deletions(-) rename app/src/main/cpp/core/{Emu48.c => emu48.c} (96%) rename app/src/main/cpp/core/{Emu48.h => emu48.h} (97%) rename app/src/main/cpp/core/{Opcodes.h => opcodes.h} (100%) mode change 100644 => 100755 gradlew diff --git a/app/build.gradle b/app/build.gradle index 206140f..9b071c2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -68,6 +68,7 @@ android { ndk { debugSymbolLevel 'FULL' // { SYMBOL_TABLE | FULL } } + signingConfig signingConfigs.debug } } compileOptions { diff --git a/app/src/main/cpp/core/apple.c b/app/src/main/cpp/core/apple.c index 665f06e..db9f422 100644 --- a/app/src/main/cpp/core/apple.c +++ b/app/src/main/cpp/core/apple.c @@ -8,8 +8,8 @@ * */ #include "pch.h" -#include "Emu48.h" -#include "Opcodes.h" +#include "emu48.h" +#include "opcodes.h" #include "apple.h" #include "io.h" // I/O register definitions #include "i28f160.h" @@ -18,7 +18,7 @@ #pragma intrinsic(memset,memcpy) -#include "Ops.h" +#include "ops.h" // // ROM buffer access functions diff --git a/app/src/main/cpp/core/cursor.c b/app/src/main/cpp/core/cursor.c index 2e80a3a..e2a010d 100644 --- a/app/src/main/cpp/core/cursor.c +++ b/app/src/main/cpp/core/cursor.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" // hand cursor AND mask static CONST BYTE ANDmaskCursor[] = diff --git a/app/src/main/cpp/core/ddeserv.c b/app/src/main/cpp/core/ddeserv.c index 3d219b4..afc6cd2 100644 --- a/app/src/main/cpp/core/ddeserv.c +++ b/app/src/main/cpp/core/ddeserv.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "io.h" HDDEDATA CALLBACK DdeCallback(UINT iType,UINT iFmt,HCONV hConv, diff --git a/app/src/main/cpp/core/debugdll.c b/app/src/main/cpp/core/debugdll.c index 2f7c8a4..a84da35 100644 --- a/app/src/main/cpp/core/debugdll.c +++ b/app/src/main/cpp/core/debugdll.c @@ -8,8 +8,8 @@ */ #include "pch.h" #include "resource.h" -#include "Emu48.h" -#include "Opcodes.h" +#include "emu48.h" +#include "opcodes.h" #include "ops.h" #include "debugger.h" diff --git a/app/src/main/cpp/core/debugger.c b/app/src/main/cpp/core/debugger.c index 67218f3..9960fd6 100644 --- a/app/src/main/cpp/core/debugger.c +++ b/app/src/main/cpp/core/debugger.c @@ -8,8 +8,8 @@ */ #include "pch.h" #include "resource.h" -#include "Emu48.h" -#include "Opcodes.h" +#include "emu48.h" +#include "opcodes.h" #include "ops.h" #include "color.h" #include "disrpl.h" diff --git a/app/src/main/cpp/core/disasm.c b/app/src/main/cpp/core/disasm.c index f5cbe55..a407160 100644 --- a/app/src/main/cpp/core/disasm.c +++ b/app/src/main/cpp/core/disasm.c @@ -8,7 +8,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #pragma inline_depth(0) diff --git a/app/src/main/cpp/core/dismem.c b/app/src/main/cpp/core/dismem.c index 6cda3e6..0e80216 100644 --- a/app/src/main/cpp/core/dismem.c +++ b/app/src/main/cpp/core/dismem.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" typedef struct // type of model memory mapping { diff --git a/app/src/main/cpp/core/display.c b/app/src/main/cpp/core/display.c index 2c1bffe..60c17b0 100644 --- a/app/src/main/cpp/core/display.c +++ b/app/src/main/cpp/core/display.c @@ -9,7 +9,7 @@ */ #include "pch.h" #include "resource.h" -#include "Emu48.h" +#include "emu48.h" #include "io.h" #include "kml.h" diff --git a/app/src/main/cpp/core/disrpl.c b/app/src/main/cpp/core/disrpl.c index 494eae8..4525421 100644 --- a/app/src/main/cpp/core/disrpl.c +++ b/app/src/main/cpp/core/disrpl.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "disrpl.h" DWORD dwRplPlatform = RPL_P3; // current RPL platform diff --git a/app/src/main/cpp/core/Emu48.c b/app/src/main/cpp/core/emu48.c similarity index 96% rename from app/src/main/cpp/core/Emu48.c rename to app/src/main/cpp/core/emu48.c index fe045f6..98287b0 100644 --- a/app/src/main/cpp/core/Emu48.c +++ b/app/src/main/cpp/core/emu48.c @@ -8,7 +8,7 @@ */ #include "pch.h" #include "resource.h" -#include "Emu48.h" +#include "emu48.h" #include "io.h" #include "kml.h" #include "debugger.h" @@ -1751,7 +1751,7 @@ static LRESULT OnToolDisasm(VOID) // disasm dialogbox call static LRESULT OnTopics(VOID) { - ShellExecute(hWnd,_T("open"),_T("Emu48.htm"),NULL,szEmuDirectory,SW_SHOWNORMAL); + ShellExecute(hWnd,_T("open"),_T("emu48.htm"),NULL,szEmuDirectory,SW_SHOWNORMAL); return 0; } diff --git a/app/src/main/cpp/core/Emu48.h b/app/src/main/cpp/core/emu48.h similarity index 97% rename from app/src/main/cpp/core/Emu48.h rename to app/src/main/cpp/core/emu48.h index 26eb81e..3c07eae 100644 --- a/app/src/main/cpp/core/Emu48.h +++ b/app/src/main/cpp/core/emu48.h @@ -1,5 +1,5 @@ /* - * Emu48.h + * emu48.h * * This file is part of Emu48 * diff --git a/app/src/main/cpp/core/emu48dll.c b/app/src/main/cpp/core/emu48dll.c index ac2edb4..93df381 100644 --- a/app/src/main/cpp/core/emu48dll.c +++ b/app/src/main/cpp/core/emu48dll.c @@ -9,7 +9,7 @@ #include "pch.h" #include "resource.h" -#include "Emu48.h" +#include "emu48.h" #include "io.h" #include "kml.h" #include "debugger.h" diff --git a/app/src/main/cpp/core/engine.c b/app/src/main/cpp/core/engine.c index e905793..0e41303 100644 --- a/app/src/main/cpp/core/engine.c +++ b/app/src/main/cpp/core/engine.c @@ -7,8 +7,8 @@ * */ #include "pch.h" -#include "Emu48.h" -#include "Opcodes.h" +#include "emu48.h" +#include "opcodes.h" #include "io.h" #include "debugger.h" @@ -72,7 +72,7 @@ static DWORD dwOldCyc; // cpu cycles at last event static DWORD dwSpeedRef; // timer value at last event static DWORD dwTickRef; // sample timer ticks -#include "Ops.h" +#include "ops.h" // save last instruction in circular instruction buffer static __inline VOID SaveInstrAddr(DWORD dwAddr) diff --git a/app/src/main/cpp/core/external.c b/app/src/main/cpp/core/external.c index e548b54..4211599 100644 --- a/app/src/main/cpp/core/external.c +++ b/app/src/main/cpp/core/external.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "ops.h" #define SAMPLES_PER_SEC 44100 // sound sampling rate diff --git a/app/src/main/cpp/core/fetch.c b/app/src/main/cpp/core/fetch.c index e19cdf8..66c4c90 100644 --- a/app/src/main/cpp/core/fetch.c +++ b/app/src/main/cpp/core/fetch.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Opcodes.h" +#include "opcodes.h" #define F 0xFF // F = function diff --git a/app/src/main/cpp/core/files.c b/app/src/main/cpp/core/files.c index d7c2e5b..a38cef7 100644 --- a/app/src/main/cpp/core/files.c +++ b/app/src/main/cpp/core/files.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "ops.h" #include "io.h" // I/O register definitions #include "kml.h" diff --git a/app/src/main/cpp/core/i28f160.c b/app/src/main/cpp/core/i28f160.c index b7175c9..e3d9f81 100644 --- a/app/src/main/cpp/core/i28f160.c +++ b/app/src/main/cpp/core/i28f160.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "i28f160.h" #define ARRAYSIZEOF(a) (sizeof(a) / sizeof(a[0])) diff --git a/app/src/main/cpp/core/keyboard.c b/app/src/main/cpp/core/keyboard.c index 9072982..fa21f1d 100644 --- a/app/src/main/cpp/core/keyboard.c +++ b/app/src/main/cpp/core/keyboard.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "io.h" // I/O definitions DWORD dwKeyMinDelay = 50; // minimum time for key hold diff --git a/app/src/main/cpp/core/keymacro.c b/app/src/main/cpp/core/keymacro.c index 9d4d930..dfa5df1 100644 --- a/app/src/main/cpp/core/keymacro.c +++ b/app/src/main/cpp/core/keymacro.c @@ -8,7 +8,7 @@ */ #include "pch.h" #include "resource.h" -#include "Emu48.h" +#include "emu48.h" #include "kml.h" #define KEYMACROHEAD "Emu-KeyMacro" // macro signature diff --git a/app/src/main/cpp/core/kml.c b/app/src/main/cpp/core/kml.c index 7e3ebbe..fb311c2 100644 --- a/app/src/main/cpp/core/kml.c +++ b/app/src/main/cpp/core/kml.c @@ -8,7 +8,7 @@ */ #include "pch.h" #include "resource.h" -#include "Emu48.h" +#include "emu48.h" #include "kml.h" static VOID InitLex(LPCTSTR szScript); diff --git a/app/src/main/cpp/core/lowbat.c b/app/src/main/cpp/core/lowbat.c index adfc75d..6a3a5a2 100644 --- a/app/src/main/cpp/core/lowbat.c +++ b/app/src/main/cpp/core/lowbat.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "io.h" // I/O definitions // #define BAT_SIMULATION // switch low bat simulation diff --git a/app/src/main/cpp/core/mops.c b/app/src/main/cpp/core/mops.c index dfbb2e0..2fa0533 100644 --- a/app/src/main/cpp/core/mops.c +++ b/app/src/main/cpp/core/mops.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "ops.h" #include "opcodes.h" #include "io.h" diff --git a/app/src/main/cpp/core/mru.c b/app/src/main/cpp/core/mru.c index a72e4a9..bff3f0f 100644 --- a/app/src/main/cpp/core/mru.c +++ b/app/src/main/cpp/core/mru.c @@ -8,7 +8,7 @@ */ #include "pch.h" #include "resource.h" -#include "Emu48.h" +#include "emu48.h" static TCHAR szOriginal[MAX_PATH] = _T(""); diff --git a/app/src/main/cpp/core/opcodes.c b/app/src/main/cpp/core/opcodes.c index 81a4ecd..f6e2580 100644 --- a/app/src/main/cpp/core/opcodes.c +++ b/app/src/main/cpp/core/opcodes.c @@ -8,8 +8,8 @@ * */ #include "pch.h" -#include "Emu48.h" -#include "Opcodes.h" +#include "emu48.h" +#include "opcodes.h" #include "apple.h" #include "io.h" // I/O register definitions @@ -25,7 +25,7 @@ #pragma intrinsic(memset,memcpy) -#include "Ops.h" +#include "ops.h" // Fields start and length UINT F_s[16] = {0/*P*/,0,2,0,15,3,0,0,0,0,0,0,0,0,0,0}; diff --git a/app/src/main/cpp/core/Opcodes.h b/app/src/main/cpp/core/opcodes.h similarity index 100% rename from app/src/main/cpp/core/Opcodes.h rename to app/src/main/cpp/core/opcodes.h diff --git a/app/src/main/cpp/core/redeye.c b/app/src/main/cpp/core/redeye.c index 2c47163..eccff1c 100644 --- a/app/src/main/cpp/core/redeye.c +++ b/app/src/main/cpp/core/redeye.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "io.h" #define ERR_CHAR 127 // character for transfer error diff --git a/app/src/main/cpp/core/romcrc.c b/app/src/main/cpp/core/romcrc.c index fd0c172..84eeebd 100644 --- a/app/src/main/cpp/core/romcrc.c +++ b/app/src/main/cpp/core/romcrc.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "ops.h" // flash page types diff --git a/app/src/main/cpp/core/rpl.c b/app/src/main/cpp/core/rpl.c index 2f90efe..726578b 100644 --- a/app/src/main/cpp/core/rpl.c +++ b/app/src/main/cpp/core/rpl.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "ops.h" #include "io.h" diff --git a/app/src/main/cpp/core/serial.c b/app/src/main/cpp/core/serial.c index 0433a06..3e15184 100644 --- a/app/src/main/cpp/core/serial.c +++ b/app/src/main/cpp/core/serial.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "io.h" #define INTERRUPT ((void)(Chipset.SoftInt=TRUE,bInterrupt=TRUE)) diff --git a/app/src/main/cpp/core/settings.c b/app/src/main/cpp/core/settings.c index 6d5d539..0c8f1c3 100644 --- a/app/src/main/cpp/core/settings.c +++ b/app/src/main/cpp/core/settings.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "i28f160.h" // #define REGISTRY // use registry instead of *.ini file diff --git a/app/src/main/cpp/core/sndenum.c b/app/src/main/cpp/core/sndenum.c index eb9adda..aa05df3 100644 --- a/app/src/main/cpp/core/sndenum.c +++ b/app/src/main/cpp/core/sndenum.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "snddef.h" typedef HRESULT (WINAPI *LPFNDLLGETCLASSOBJECT)(REFCLSID,REFIID,LPVOID *); diff --git a/app/src/main/cpp/core/sound.c b/app/src/main/cpp/core/sound.c index 7976cfd..cc2c5f2 100644 --- a/app/src/main/cpp/core/sound.c +++ b/app/src/main/cpp/core/sound.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" // #define DEBUG_SOUND // switch for sound debug purpose // #define SINE_APPROX // sine signal approximation diff --git a/app/src/main/cpp/core/stack.c b/app/src/main/cpp/core/stack.c index 570dcbc..b060251 100644 --- a/app/src/main/cpp/core/stack.c +++ b/app/src/main/cpp/core/stack.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "io.h" #define fnRadix 51 // fraction mark diff --git a/app/src/main/cpp/core/symbfile.c b/app/src/main/cpp/core/symbfile.c index 16e7658..df2d9ca 100644 --- a/app/src/main/cpp/core/symbfile.c +++ b/app/src/main/cpp/core/symbfile.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" //################ //# diff --git a/app/src/main/cpp/core/timer.c b/app/src/main/cpp/core/timer.c index 15cf9c5..cd01424 100644 --- a/app/src/main/cpp/core/timer.c +++ b/app/src/main/cpp/core/timer.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" #include "ops.h" #include "io.h" // I/O definitions diff --git a/app/src/main/cpp/core/udp.c b/app/src/main/cpp/core/udp.c index 7e20930..d7fa06c 100644 --- a/app/src/main/cpp/core/udp.c +++ b/app/src/main/cpp/core/udp.c @@ -7,7 +7,7 @@ * */ #include "pch.h" -#include "Emu48.h" +#include "emu48.h" TCHAR szUdpServer[1024] = _T("localhost"); WORD wUdpPort = 5025; // scpi-raw diff --git a/app/src/main/cpp/emu.h b/app/src/main/cpp/emu.h index 71072e0..f1539e5 100644 --- a/app/src/main/cpp/emu.h +++ b/app/src/main/cpp/emu.h @@ -12,4 +12,4 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#include "core/Emu48.h" +#include "core/emu48.h" diff --git a/gradlew b/gradlew old mode 100644 new mode 100755