0.8.3 mergeo

.github/FUNDING.yml

@@ -0,0 +1 @@
+patreon: staplebutter

.gitignore

@@ -6,3 +6,5 @@ obj
 melon_grc.c
 melon_grc.h
 cmake-build
+cmake-build-debug
+.idea

CMakeLists.txt

@@ -22,6 +22,11 @@ endif()
 
 if(ENABLE_LTO)
 	add_compile_options(-O3 -flto)
+	set(CMAKE_AR "gcc-ar")
+	set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> <LINK_FLAGS> <OBJECTS>")
+	set(CMAKE_C_ARCHIVE_FINISH   true)
+	set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> <LINK_FLAGS> <OBJECTS>")
+	set(CMAKE_CXX_ARCHIVE_FINISH   true)
 endif()
 
 add_compile_options(-fno-pic)

README.md

@@ -2,7 +2,7 @@
 <h2 align="center"><b>melonDS</b></h2>
 <p align="center">
 <a href="http://melonds.kuribo64.net/" alt="melonDS website"><img src="https://img.shields.io/badge/website-melonds.kuribo64.net-%2331352e.svg"></a>
-<a href="http://melonds.kuribo64.net/downloads.php" alt="Release: 0.8.2"><img src="https://img.shields.io/badge/release-0.8.2-%235c913b.svg"></a>
+<a href="http://melonds.kuribo64.net/downloads.php" alt="Release: 0.8.3"><img src="https://img.shields.io/badge/release-0.8.3-%235c913b.svg"></a>
 <a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-%23ff554d.svg"></a>
 <a href="https://kiwiirc.com/client/irc.badnik.net/?nick=IRC-Source_?#melonds" alt="IRC channel: #melonds"><img src="https://img.shields.io/badge/IRC%20chat-%23melonds-%23dd2e44.svg"></a>
 </p>

melon.rc

@@ -6,23 +6,23 @@
 
 //include version information in .exe, modify these values to match your needs
 1 VERSIONINFO
-FILEVERSION 0,8,2,0
-PRODUCTVERSION 0,8,2,0
+FILEVERSION 0,8,3,0
+PRODUCTVERSION 0,8,3,0
 FILETYPE VFT_APP
 {
   BLOCK "StringFileInfo"
 	{
 		BLOCK "040904E4"
 		{
 			VALUE "CompanyName", "Melon Factory of Kuribo64"
-			VALUE "FileVersion", "0.8.2"
+			VALUE "FileVersion", "0.8.3"
 			VALUE "FileDescription", "DS emulator, sorta. also 1st quality melon."
 			VALUE "InternalName", "SDnolem"
 			VALUE "LegalCopyright", "2016-2019 Arisotura & co."
 			VALUE "LegalTrademarks", ""
 			VALUE "OriginalFilename", "zafkflzdasd.exe"
 			VALUE "ProductName", "melonDS"
-			VALUE "ProductVersion", "0.8.2"
+			VALUE "ProductVersion", "0.8.3"
 		}
 	}
   BLOCK "VarFileInfo"

melonDS.cbp

@@ -53,6 +53,24 @@
 					<Add option="-m64" />
 				</Linker>
 			</Target>
+			<Target title="DebugFast-Cap Windows">
+				<Option platforms="Windows;" />
+				<Option output="bin/DebugFast_Cap/melonDS" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/DebugFast_Cap/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-O3" />
+					<Add option="-m64" />
+					<Add option="-D_FILE_OFFSET_BITS=64" />
+					<Add option="-DMELONCAP" />
+				</Compiler>
+				<Linker>
+					<Add option="-m64" />
+					<Add library="winusb" />
+					<Add library="setupapi" />
+				</Linker>
+			</Target>
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
@@ -143,6 +161,12 @@
 		<Unit filename="src/libui_sdl/LAN_PCap.h" />
 		<Unit filename="src/libui_sdl/LAN_Socket.cpp" />
 		<Unit filename="src/libui_sdl/LAN_Socket.h" />
+		<Unit filename="src/libui_sdl/MelonCap.cpp">
+			<Option target="DebugFast-Cap Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/MelonCap.h">
+			<Option target="DebugFast-Cap Windows" />
+		</Unit>
 		<Unit filename="src/libui_sdl/OSD.cpp" />
 		<Unit filename="src/libui_sdl/OSD.h" />
 		<Unit filename="src/libui_sdl/Platform.cpp" />

src/GPU.cpp

@@ -287,6 +287,7 @@ void SetDisplaySettings(bool accel)
     if (Framebuffer[1][0]) delete[] Framebuffer[1][0];
     if (Framebuffer[0][1]) delete[] Framebuffer[0][1];
     if (Framebuffer[1][1]) delete[] Framebuffer[1][1];
+
     Framebuffer[0][0] = new u32[fbsize];
     Framebuffer[1][0] = new u32[fbsize];
     Framebuffer[0][1] = new u32[fbsize];