Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-21 21:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Android) Removed support for the Lite release

Browse source
This commit is contained in:
Leon Styhre 2024-03-09 13:03:59 +01:00
parent a49f22144f
commit 863d8b04af
5 changed files with 5 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
CMakeLists.txt
View file

@ -284,12 +284,7 @@ endif()
if(ANDROID)
set(BUNDLED_CERTS ON)
add_compile_definitions(ANDROID_VERSION_CODE=${ANDROID_VERSION_CODE})
if(ANDROID_LITE_RELEASE)
add_compile_definitions(ANDROID_APPLICATION_ID="org.es_de.frontend.lite")
add_compile_definitions(ANDROID_LITE_RELEASE)
else()
add_compile_definitions(ANDROID_APPLICATION_ID="org.es_de.frontend")
endif()
add_compile_definitions(ANDROID_APPLICATION_ID="org.es_de.frontend")
endif()
if(WIN32)
@ -404,11 +399,6 @@ if(ANDROID)
message(FATAL_ERROR "-- Unsupported Android ABI: " ${ANDROID_ABI})
endif()
message("-- Building with Android version code " ${ANDROID_VERSION_CODE})
if(ANDROID_LITE_RELEASE)
message("-- Building Lite release")
else()
message("-- Building full release")
endif()
endif()
# Affects the application updater and is used for displaying version info in the main menu.
@ -617,13 +607,8 @@ endif()
if(NOT WIN32)
# SVG rendering library LunaSVG and Lottie animation library rlottie.
if(ANDROID)
if(ANDROID_LITE_RELEASE)
set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_lite_${ANDROID_ABI}/liblunasvg.a)
set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_lite_${ANDROID_ABI}/librlottie.a)
else()
set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_${ANDROID_ABI}/liblunasvg.a)
set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_${ANDROID_ABI}/librlottie.a)
endif()
set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_${ANDROID_ABI}/liblunasvg.a)
set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_${ANDROID_ABI}/librlottie.a)
else()
set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/liblunasvg.a)
set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/librlottie.a)

16
es-app/src/guis/GuiMenu.cpp
View file

@ -1898,24 +1898,12 @@ void GuiMenu::openUtilities()
HelpStyle style {getHelpStyle()};
ComponentListRow row;
#if defined(ANDROID_LITE_RELEASE)
auto orphanedDataCleanup =
std::make_shared<TextComponent>("ORPHANED DATA CLEANUP (FULL VERSION ONLY)",
Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary);
orphanedDataCleanup->setOpacity(DISABLED_OPACITY);
row.addElement(orphanedDataCleanup, true);
auto orphanedDataCleanupArrow = mMenu.makeArrow();
orphanedDataCleanupArrow->setOpacity(DISABLED_OPACITY);
row.addElement(orphanedDataCleanupArrow, false);
#else
row.addElement(std::make_shared<TextComponent>("ORPHANED DATA CLEANUP",
Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary),
true);
row.addElement(mMenu.makeArrow(), false);
row.makeAcceptInputHandler(std::bind(
[this] { mWindow->pushGui(new GuiOrphanedDataCleanup([&]() { close(true); })); }));
#endif
s->addRow(row);
row.elements.clear();
@ -2093,11 +2081,7 @@ void GuiMenu::addVersionInfo()
mVersion.setFont(Font::get(FONT_SIZE_SMALL));
mVersion.setColor(mMenuColorTertiary);
#if defined(ANDROID_LITE_RELEASE)
const std::string applicationName {"ES-DE LITE"};
#else
const std::string applicationName {"ES-DE"};
#endif
#if defined(IS_PRERELEASE)
mVersion.setText(applicationName + " " + Utils::String::toUpper(PROGRAM_VERSION_STRING) +

4
es-app/src/main.cpp
View file

@ -691,11 +691,7 @@ int main(int argc, char* argv[])
Log::init();
Log::open();
{
#if defined(ANDROID_LITE_RELEASE)
const std::string applicationName {"ES-DE Lite"};
#else
const std::string applicationName {"ES-DE"};
#endif
#if defined(__ANDROID__)
LOG(LogInfo) << applicationName << " " << PROGRAM_VERSION_STRING << "-"
<< ANDROID_VERSION_CODE << " (r" << PROGRAM_RELEASE_NUMBER << "), built "

9
es-core/CMakeLists.txt
View file

@ -184,11 +184,6 @@ add_library(es-core STATIC ${CORE_SOURCES} ${CORE_HEADERS})
target_link_libraries(es-core ${COMMON_LIBRARIES})
if(ANDROID)
if(ANDROID_LITE_RELEASE)
set_target_properties(es-core PROPERTIES ARCHIVE_OUTPUT_DIRECTORY
${PROJECT_SOURCE_DIR}/../android_lite_${ANDROID_ABI})
else()
set_target_properties(es-core PROPERTIES ARCHIVE_OUTPUT_DIRECTORY
${PROJECT_SOURCE_DIR}/../android_${ANDROID_ABI})
endif()
set_target_properties(es-core PROPERTIES ARCHIVE_OUTPUT_DIRECTORY
${PROJECT_SOURCE_DIR}/../android_${ANDROID_ABI})
endif()

4
es-core/src/Window.cpp
View file

@ -887,10 +887,6 @@ void Window::stopMediaViewer()
void Window::startPDFViewer(FileData* game)
{
if (mPDFViewer) {
#if defined(ANDROID_LITE_RELEASE)
queueInfoPopup("PDF VIEWER ONLY AVAILABLE IN FULL VERSION", 6000);
return;
#endif
if (mPDFViewer->startPDFViewer(game)) {
setAllowTextScrolling(false);
setAllowFileAnimation(false);