summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-x.travis-upload.sh91
-rw-r--r--CMakeLists.txt5
-rw-r--r--src/common/emu_window.cpp7
-rw-r--r--src/core/core_timing.h2
-rw-r--r--src/core/hle/shared_page.cpp57
-rw-r--r--src/core/hle/shared_page.h5
6 files changed, 155 insertions, 12 deletions
diff --git a/.travis-upload.sh b/.travis-upload.sh
index 1ad8f5e5e..7838bf079 100755
--- a/.travis-upload.sh
+++ b/.travis-upload.sh
@@ -23,6 +23,97 @@ if [ "$TRAVIS_BRANCH" = "master" ]; then
# move SDL2 libs into folder for deployment
dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/"
+
+ # Make the changes to make the citra-qt app standalone (i.e. not dependent on the current brew installation).
+ # To do this, the absolute references to each and every QT framework must be re-written to point to the local frameworks
+ # (in the Contents/Frameworks folder).
+ # The "install_name_tool" is used to do so.
+
+ # Coreutils is a hack to coerce Homebrew to point to the absolute Cellar path (symlink dereferenced). i.e:
+ # ls -l /usr/local/opt/qt5:: /usr/local/opt/qt5 -> ../Cellar/qt5/5.6.1-1
+ # grealpath ../Cellar/qt5/5.6.1-1:: /usr/local/Cellar/qt5/5.6.1-1
+ brew install coreutils
+
+ REV_NAME_ALT=$REV_NAME/
+ # grealpath is located in coreutils, there is no "realpath" for OS X :(
+ QT_BREWS_PATH=$(grealpath "$(brew --prefix qt5)")
+ BREW_PATH=$(brew --prefix)
+ QT_VERSION_NUM=5
+
+ $BREW_PATH/opt/qt5/bin/macdeployqt "${REV_NAME_ALT}citra-qt.app" \
+ -executable="${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt"
+
+ # These are the files that macdeployqt packed into Contents/Frameworks/ - we don't want those, so we replace them.
+ declare -a macos_libs=("QtCore" "QtWidgets" "QtGui" "QtOpenGL" "QtPrintSupport")
+
+ for macos_lib in "${macos_libs[@]}"
+ do
+ SC_FRAMEWORK_PART=$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib
+ # Replace macdeployqt versions of the Frameworks with our own (from /usr/local/opt/qt5/lib/)
+ cp "$BREW_PATH/opt/qt5/lib/$SC_FRAMEWORK_PART" "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
+
+ # Replace references within the embedded Framework files with "internal" versions.
+ for macos_lib2 in "${macos_libs[@]}"
+ do
+ # Since brew references both the non-symlinked and symlink paths of QT5, it needs to be duplicated.
+ # /usr/local/Cellar/qt5/5.6.1-1/lib and /usr/local/opt/qt5/lib both resolve to the same files.
+ # So the two lines below are effectively duplicates when resolved as a path, but as strings, they aren't.
+ RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2
+ install_name_tool -change \
+ $QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
+ @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
+ "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
+ install_name_tool -change \
+ "$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
+ @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
+ "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
+ done
+ done
+
+ # Handles `This application failed to start because it could not find or load the Qt platform plugin "cocoa"`
+ # Which manifests itself as:
+ # "Exception Type: EXC_CRASH (SIGABRT) | Exception Codes: 0x0000000000000000, 0x0000000000000000 | Exception Note: EXC_CORPSE_NOTIFY"
+ # There may be more dylibs needed to be fixed...
+ declare -a macos_plugins=("Plugins/platforms/libqcocoa.dylib")
+
+ for macos_lib in "${macos_plugins[@]}"
+ do
+ install_name_tool -id @executable_path/../$macos_lib "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
+ for macos_lib2 in "${macos_libs[@]}"
+ do
+ RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2
+ install_name_tool -change \
+ $QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
+ @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
+ "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
+ install_name_tool -change \
+ "$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
+ @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
+ "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
+ done
+ done
+
+ for macos_lib in "${macos_libs[@]}"
+ do
+ # Debugging info for Travis-CI
+ otool -L "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib"
+ done
+
+ # Make the citra-qt.app application launch a debugging terminal.
+ # Store away the actual binary
+ mv ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt-bin
+
+ cat > ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt <<EOL
+#!/usr/bin/env bash
+cd "\`dirname "\$0"\`"
+chmod +x citra-qt-bin
+open citra-qt-bin --args "\$@"
+EOL
+ # Content that will serve as the launching script for citra (within the .app folder)
+
+ # Make the launching script executable
+ chmod +x ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt
+
fi
# Copy documentation
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a436b981..779eb8e50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,11 +66,6 @@ message(STATUS "Target architecture: ${ARCHITECTURE}")
if (NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wno-attributes")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-
- if (ARCHITECTURE_x86_64)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1")
- endif()
else()
# Silence "deprecation" warnings
add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_WARNINGS)
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp
index 08270dd88..fd728c109 100644
--- a/src/common/emu_window.cpp
+++ b/src/common/emu_window.cpp
@@ -51,7 +51,6 @@ static bool IsWithinTouchscreen(const EmuWindow::FramebufferLayout& layout, unsi
}
std::tuple<unsigned,unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) {
-
new_x = std::max(new_x, framebuffer_layout.bottom_screen.left);
new_x = std::min(new_x, framebuffer_layout.bottom_screen.right-1);
@@ -92,9 +91,9 @@ void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) {
}
EmuWindow::FramebufferLayout EmuWindow::FramebufferLayout::DefaultScreenLayout(unsigned width, unsigned height) {
-
- ASSERT(width > 0);
- ASSERT(height > 0);
+ // When hiding the widget, the function receives a size of 0
+ if (width == 0) width = 1;
+ if (height == 0) height = 1;
EmuWindow::FramebufferLayout res = { width, height, {}, {} };
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index 64f5b06d9..3d8a7d0c0 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -26,7 +26,7 @@
extern int g_clock_rate_arm11;
inline s64 msToCycles(int ms) {
- return g_clock_rate_arm11 / 1000 * ms;
+ return (s64)g_clock_rate_arm11 / 1000 * ms;
}
inline s64 msToCycles(float ms) {
diff --git a/src/core/hle/shared_page.cpp b/src/core/hle/shared_page.cpp
index 2a1caeaac..4d9272923 100644
--- a/src/core/hle/shared_page.cpp
+++ b/src/core/hle/shared_page.cpp
@@ -2,8 +2,11 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <chrono>
#include <cstring>
+#include <ctime>
+#include "core/core_timing.h"
#include "core/hle/shared_page.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -12,6 +15,57 @@ namespace SharedPage {
SharedPageDef shared_page;
+static int update_time_event;
+
+/// Gets system time in 3DS format. The epoch is Jan 1900, and the unit is millisecond.
+static u64 GetSystemTime() {
+ auto now = std::chrono::system_clock::now();
+
+ // 3DS system does't allow user to set a time before Jan 1 2000,
+ // so we use it as an auxiliary epoch to calculate the console time.
+ std::tm epoch_tm;
+ epoch_tm.tm_sec = 0;
+ epoch_tm.tm_min = 0;
+ epoch_tm.tm_hour = 0;
+ epoch_tm.tm_mday = 1;
+ epoch_tm.tm_mon = 0;
+ epoch_tm.tm_year = 100;
+ epoch_tm.tm_isdst = 0;
+ auto epoch = std::chrono::system_clock::from_time_t(std::mktime(&epoch_tm));
+
+ // 3DS console time uses Jan 1 1900 as internal epoch,
+ // so we use the milliseconds between 1900 and 2000 as base console time
+ u64 console_time = 3155673600000ULL;
+
+ // Only when system time is after 2000, we set it as 3DS system time
+ if (now > epoch) {
+ console_time += std::chrono::duration_cast<std::chrono::milliseconds>(now - epoch).count();
+ }
+
+ // If the system time is in daylight saving, we give an additional hour to console time
+ std::time_t now_time_t = std::chrono::system_clock::to_time_t(now);
+ std::tm* now_tm = std::localtime(&now_time_t);
+ if (now_tm && now_tm->tm_isdst > 0)
+ console_time += 60 * 60 * 1000;
+
+ return console_time;
+}
+
+static void UpdateTimeCallback(u64 userdata, int cycles_late) {
+ DateTime& date_time = shared_page.date_time_counter % 2 ?
+ shared_page.date_time_0 : shared_page.date_time_1;
+
+ date_time.date_time = GetSystemTime();
+ date_time.update_tick = CoreTiming::GetTicks();
+ date_time.tick_to_second_coefficient = g_clock_rate_arm11;
+ date_time.tick_offset = 0;
+
+ ++shared_page.date_time_counter;
+
+ // system time is updated hourly
+ CoreTiming::ScheduleEvent(msToCycles(60 * 60 * 1000) - cycles_late, update_time_event);
+}
+
void Init() {
std::memset(&shared_page, 0, sizeof(shared_page));
@@ -19,6 +73,9 @@ void Init() {
// Some games wait until this value becomes 0x1, before asking running_hw
shared_page.unknown_value = 0x1;
+
+ update_time_event = CoreTiming::RegisterEvent("SharedPage::UpdateTimeCallback", UpdateTimeCallback);
+ CoreTiming::ScheduleEvent(0, update_time_event);
}
} // namespace
diff --git a/src/core/hle/shared_page.h b/src/core/hle/shared_page.h
index 35a07c685..cd9246726 100644
--- a/src/core/hle/shared_page.h
+++ b/src/core/hle/shared_page.h
@@ -25,13 +25,14 @@ namespace SharedPage {
struct DateTime {
u64_le date_time; // 0
u64_le update_tick; // 8
- INSERT_PADDING_BYTES(0x20 - 0x10); // 10
+ u64_le tick_to_second_coefficient; // 10
+ u64_le tick_offset; // 18
};
static_assert(sizeof(DateTime) == 0x20, "Datetime size is wrong");
struct SharedPageDef {
// Most of these names are taken from the 3dbrew page linked above.
- u32_le date_time_selector; // 0
+ u32_le date_time_counter; // 0
u8 running_hw; // 4
/// "Microcontroller hardware info"
u8 mcu_hw_info; // 5
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 16:05:25 +0000