Try to fix android build

This commit is contained in:
zilmar 2023-09-28 15:25:34 +09:30
parent 46e6e54f24
commit 7e249d22b1
4 changed files with 22 additions and 2 deletions

View File

@ -51,6 +51,10 @@ echo copy Project64-core
xcopy "%base_dir%/Source/Project64-core" "%base_dir%/Android/jni/Project64-core/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
echo copy Project64-rsp-core
xcopy "%base_dir%/Source/Project64-rsp-core" "%base_dir%/Android/jni/Project64-rsp-core/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
echo copy Project64-video
xcopy "%base_dir%/Source/Project64-video" "%base_dir%/Android/jni/Project64-video/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)

View File

@ -107,7 +107,8 @@ add_library(Project64-core STATIC
Settings/SettingType/SettingsType-TempString.cpp
Settings/DebugSettings.cpp
Settings/GameSettings.cpp
Settings/N64SystemSettings.cpp)
Settings/N64SystemSettings.cpp
../Project64-rsp-core/cpu/RSPRegisterHandler.cpp)
add_definitions(-DANDROID)

View File

@ -0,0 +1,11 @@
*.c
*.cpp
*.h
*.vcproj
*.vcxproj
*.vcxproj.filters
*.dsp
*.plg
*.txt
*.rc
*.h.in

View File

@ -152,9 +152,13 @@ EXPORT void DllAbout(void * hParent)
}
#ifdef _WIN32
BOOL WINAPI DllMain(HINSTANCE hinst, DWORD /*fdwReason*/, LPVOID /*lpvReserved*/)
BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID /*lpvReserved*/)
{
hinstDLL = hinst;
if (fdwReason == DLL_PROCESS_DETACH)
{
StopCPULog();
}
return true;
}