diff --git a/CMakeLists.txt b/CMakeLists.txt index 734182004..ac2301cb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,7 +198,6 @@ if (NOT DEFINED ARCHITECTURE) endif() message(STATUS "Target architecture: ${ARCHITECTURE}") - # Configure C++ standard # =========================== @@ -216,7 +215,6 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN NO) # set up output paths for executable binaries set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/$) - # System imported libraries # ====================== diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/LICENSE.rst b/dist/qt_themes/qdarkstyle_midnight_blue/LICENSE.rst index e22b68735..d84f95aea 100644 --- a/dist/qt_themes/qdarkstyle_midnight_blue/LICENSE.rst +++ b/dist/qt_themes/qdarkstyle_midnight_blue/LICENSE.rst @@ -25,7 +25,6 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - Creative Commons Attribution International 4.0 - Images ------------------------------------------------------- @@ -80,7 +79,6 @@ exhaustive, and do not form part of our licenses. those requests where reasonable. `More considerations for the public `__. - Creative Commons Attribution 4.0 International Public License ------------------------------------------------------------- diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/style.qss b/dist/qt_themes/qdarkstyle_midnight_blue/style.qss index 7cfd7c62e..47512d2a9 100644 --- a/dist/qt_themes/qdarkstyle_midnight_blue/style.qss +++ b/dist/qt_themes/qdarkstyle_midnight_blue/style.qss @@ -384,7 +384,6 @@ QMenuBar::item:pressed { padding-bottom: 0px; } - /* QMenu ------------------------------------------------------------------ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu @@ -501,7 +500,6 @@ QAbstractScrollArea { color: #F0F0F0; } - QAbstractScrollArea:disabled { color: #787878; } diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 8762702b2..24d1f57bb 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -85,7 +85,6 @@ else() add_subdirectory(fmt EXCLUDE_FROM_ALL) endif() - # Xbyak if ("x86_64" IN_LIST ARCHITECTURE) if(USE_SYSTEM_XBYAK) diff --git a/license.txt b/license.txt index f94c73f1a..d7f3e9873 100644 --- a/license.txt +++ b/license.txt @@ -338,7 +338,6 @@ consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. - The icons used in this project have the following licenses: Icon Name | License | Origin/Author diff --git a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/features/settings/utils/SettingsFile.kt b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/features/settings/utils/SettingsFile.kt index f5f556fa0..92e8dc5f1 100644 --- a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/features/settings/utils/SettingsFile.kt +++ b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/features/settings/utils/SettingsFile.kt @@ -28,7 +28,6 @@ import java.io.IOException import java.io.InputStreamReader import java.util.TreeMap - /** * Contains static methods for interacting with .ini files in which settings are stored. */ diff --git a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/utils/EmulationLifecycleUtil.kt b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/utils/EmulationLifecycleUtil.kt index 41d07765c..744755b50 100644 --- a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/utils/EmulationLifecycleUtil.kt +++ b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/utils/EmulationLifecycleUtil.kt @@ -8,7 +8,6 @@ object EmulationLifecycleUtil { private var shutdownHooks: MutableList = ArrayList() private var pauseResumeHooks: MutableList = ArrayList() - fun closeGame() { shutdownHooks.forEach(Runnable::run) } diff --git a/src/core/arm/dyncom/arm_dyncom_dec.cpp b/src/core/arm/dyncom/arm_dyncom_dec.cpp index ce8fbd95f..1eca385c9 100644 --- a/src/core/arm/dyncom/arm_dyncom_dec.cpp +++ b/src/core/arm/dyncom/arm_dyncom_dec.cpp @@ -232,7 +232,6 @@ const InstructionSetEncodingItem arm_instruction[] = { { "bbl", 1, 0, { 25, 27, 0x00000005 }}, }; - const InstructionSetEncodingItem arm_exclusion_code[] = { { "vmla", 0, ARMVFP2, { 0 }}, { "vmls", 0, ARMVFP2, { 0 }}, diff --git a/src/dedicated_room/mandarine-room.rc b/src/dedicated_room/mandarine-room.rc index e1aecadc4..0a2ccbf81 100644 --- a/src/dedicated_room/mandarine-room.rc +++ b/src/dedicated_room/mandarine-room.rc @@ -8,7 +8,6 @@ // remains consistent on all systems. MANDARINE_ICON ICON "../../dist/mandarine.ico" - ///////////////////////////////////////////////////////////////////////////// // // RT_MANIFEST diff --git a/src/mandarine_qt/mandarine-qt.rc b/src/mandarine_qt/mandarine-qt.rc index 286df83c5..04294902a 100644 --- a/src/mandarine_qt/mandarine-qt.rc +++ b/src/mandarine_qt/mandarine-qt.rc @@ -10,7 +10,6 @@ IDI_ICON1 ICON "../../dist/mandarine.ico" - ///////////////////////////////////////////////////////////////////////////// // // RT_MANIFEST diff --git a/src/video_core/host_shaders/texture_filtering/scale_force.frag b/src/video_core/host_shaders/texture_filtering/scale_force.frag index 46a24c6df..6287288eb 100644 --- a/src/video_core/host_shaders/texture_filtering/scale_force.frag +++ b/src/video_core/host_shaders/texture_filtering/scale_force.frag @@ -103,7 +103,6 @@ void main() { vec4 tc = textureLodOffset(input_texture, tex_coord, 0.0, ivec2(0, 1)); vec4 tr = textureLodOffset(input_texture, tex_coord, 0.0, ivec2(1, 1)); - tex_size = vec2(textureSize(input_texture, 0)); inv_tex_size = 1.0 / tex_size; center_matrix = mat4x3(cc.rgb, cc.rgb, cc.rgb, cc.rgb);