Merge 9d92b8708a into 7c1d2a64f4

Set WIN32_LEAN_AND_MEAN, gets rid of the winsock2 warnings and probably
speeds up compilation a tiny bit oh and NOMINMAX too for good measure while we're at it
2024-11-14 05:17:40 -07:00 · 2024-11-12 12:56:34 +01:00 · 2024-11-11 14:18:05 +01:00 · 2024-11-11 12:06:12 +01:00 · 2024-11-09 14:19:02 +01:00 · 2024-11-09 08:32:34 +01:00
7 changed files with 20 additions and 14 deletions
--- a/BUILD.md
+++ b/BUILD.md
@ -12,7 +12,7 @@
     * 22.04: `sudo apt install qtbase6-dev qtbase6-private-dev qtmultimedia6-dev libqt6svg6-dev`
     * Older versions: `sudo apt install qtbase5-dev qtbase5-private-dev qtmultimedia5-dev libqt5svg5-dev`  
       Also add `-DUSE_QT6=OFF` to the first CMake command below.
-   * Fedora: `sudo dnf install gcc-c++ cmake extra-cmake-modules SDL2-devel libarchive-devel enet-devel libzstd-devel qt6-{qtbase,qtmultimedia,qtsvg}-devel wayland-devel`
+   * Fedora: `sudo dnf install gcc-c++ cmake extra-cmake-modules SDL2-devel libarchive-devel enet-devel libzstd-devel qt6-{qtbase,qtbase-private,qtmultimedia,qtsvg}-devel wayland-devel`
   * Arch Linux: `sudo pacman -S base-devel cmake extra-cmake-modules git libpcap sdl2 qt6-{base,multimedia,svg} libarchive enet zstd`
 2. Download the melonDS repository and prepare:
   ```bash
@ -40,7 +40,7 @@
 5. Install dependencies:  
   Replace `<prefix>` below with `mingw-w64-ucrt-x86_64` on x64 systems, or `mingw-w64-clang-aarch64` on ARM64 systems.
   ```bash
-   pacman -S <prefix>-{toolchain,cmake,SDL2,libarchive,enet,zstd}`
+   pacman -S <prefix>-{toolchain,cmake,SDL2,libarchive,enet,zstd}
   ```
 6. Install Qt and configure the build directory
   * Dynamic builds (with DLLs)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -127,6 +127,8 @@ if (ENABLE_JIT)
    endif()
 endif()

+target_include_directories(core INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
+
 set(MELONDS_VERSION_SUFFIX "$ENV{MELONDS_VERSION_SUFFIX}" CACHE STRING "Suffix to add to displayed melonDS version")
 option(MELONDS_EMBED_BUILD_INFO "Embed detailed build info into the binary" OFF)
 set(MELONDS_GIT_BRANCH "$ENV{MELONDS_GIT_BRANCH}" CACHE STRING "The Git branch used for this build")
@ -178,6 +180,7 @@ endif()

 if (WIN32)
    target_link_libraries(core PRIVATE ole32 comctl32 wsock32 ws2_32)
+    target_compile_definitions(core PUBLIC WIN32_LEAN_AND_MEAN NOMINMAX)
 elseif(NOT APPLE AND NOT HAIKU)
    check_library_exists(rt shm_open "" NEED_LIBRT)
    if (NEED_LIBRT)
--- a/src/GPU3D_OpenGL_shaders.h
+++ b/src/GPU3D_OpenGL_shaders.h
@ -681,6 +681,7 @@ void main()

    vec4 fpos;
    fpos.xy = (((vec2(vPosition.xy) ) * 2.0) / uScreenSize) - 1.0;
+    fpos.z = 0.0;
    fZ = float(vPosition.z << zshift) / 16777216.0;
    fpos.w = float(vPosition.w) / 65536.0f;
    fpos.xy *= fpos.w;
--- a/src/debug/GdbProto.cpp
+++ b/src/debug/GdbProto.cpp
@ -113,7 +113,7 @@ Gdb::ReadResult GdbStub::ParseAndSetupPacket()
 	ReadResult result, prevResult;
 	while (true)
 	{
-		ReadResult result = TryParsePacket(i, packetStart, packetSize, packetContentSize);
+		result = TryParsePacket(i, packetStart, packetSize, packetContentSize);
 		if (result == ReadResult::NoPacket)
 			break;
 		if (result != ReadResult::CmdRecvd && result != ReadResult::Break)
--- a/src/frontend/qt_sdl/AboutDialog.ui
+++ b/src/frontend/qt_sdl/AboutDialog.ui
@ -133,6 +133,9 @@
         <property name="text">
          <string>By Arisotura, the melonDS team &lt;a href=&quot;https://github.com/melonDS-emu/melonDS/graphs/contributors&quot;&gt;and contributors&lt;/a&gt;.</string>
         </property>
+         <property name="openExternalLinks">
+          <bool>true</bool>
+         </property>
        </widget>
       </item>
       <item>
--- a/src/frontend/qt_sdl/CMakeLists.txt
+++ b/src/frontend/qt_sdl/CMakeLists.txt
@ -91,8 +91,7 @@ add_compile_definitions(ARCHIVE_SUPPORT_ENABLED)
 add_executable(melonDS ${SOURCES_QT_SDL})

 add_subdirectory("../../net"
-        "${CMAKE_BINARY_DIR}/net"
-)
+    ${CMAKE_BINARY_DIR}/net)

 target_link_libraries(melonDS PRIVATE net-utils)

@ -171,10 +170,10 @@ if (BUILD_STATIC)
    endif()
 endif()

-target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
-target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
-target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../..")
-target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../net")
+target_include_directories(melonDS PUBLIC
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}/..")
+
 if (USE_QT6)
    target_include_directories(melonDS PUBLIC ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
 else()
--- a/src/net/CMakeLists.txt
+++ b/src/net/CMakeLists.txt
@ -11,9 +11,9 @@ add_library(net-utils STATIC
    MPInterface.cpp
 )

-target_include_directories(net-utils PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
-target_include_directories(net-utils PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
-
+target_include_directories(net-utils PUBLIC
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}/..")

 option(USE_SYSTEM_LIBSLIRP "Use system libslirp instead of the bundled version" OFF)
 if (USE_SYSTEM_LIBSLIRP)
Author	SHA1	Message	Date
Jakly	30d1bbec94	Merge `9d92b8708a` into `7c1d2a64f4`	2024-11-12 12:56:34 +01:00
Nadia Holmquist Pedersen	7c1d2a64f4	Set WIN32_LEAN_AND_MEAN, gets rid of the winsock2 warnings and probably Some checks failed macOS / ${{ matrix.arch }} (arm64) (push) Has been cancelled Details macOS / ${{ matrix.arch }} (x86_64) (push) Has been cancelled Details Ubuntu / x86_64 (push) Has been cancelled Details Ubuntu / aarch64 (push) Has been cancelled Details Windows / build (push) Has been cancelled Details macOS / Universal binary (push) Has been cancelled Details speeds up compilation a tiny bit oh and NOMINMAX too for good measure while we're at it	2024-11-11 14:18:05 +01:00
Nadia Holmquist Pedersen	b2f6fab6f4	cmake: use interface include directories properly and fix an indent I guess	2024-11-11 12:06:12 +01:00
RSDuck	4528441c74	for OGL renderer W buffer rendering avoid undefined vertex z Some checks failed macOS / ${{ matrix.arch }} (arm64) (push) Has been cancelled Details macOS / ${{ matrix.arch }} (x86_64) (push) Has been cancelled Details Ubuntu / x86_64 (push) Has been cancelled Details Ubuntu / aarch64 (push) Has been cancelled Details Windows / build (push) Has been cancelled Details macOS / Universal binary (push) Has been cancelled Details see https://github.com/melonDS-emu/melonDS/issues/2017	2024-11-09 14:19:02 +01:00
Nadia Holmquist Pedersen	8e3f6cc519	add missing qtbase-private-devel for Fedora Some checks are pending macOS / ${{ matrix.arch }} (arm64) (push) Waiting to run Details macOS / ${{ matrix.arch }} (x86_64) (push) Waiting to run Details macOS / Universal binary (push) Blocked by required conditions Details Ubuntu / x86_64 (push) Waiting to run Details Ubuntu / aarch64 (push) Waiting to run Details Windows / build (push) Waiting to run Details	2024-11-09 08:32:34 +01:00
Rayyan Ansari	7041b52ebc	Remove extra backtick in Windows build instructions Some checks are pending macOS / ${{ matrix.arch }} (arm64) (push) Waiting to run Details macOS / ${{ matrix.arch }} (x86_64) (push) Waiting to run Details macOS / Universal binary (push) Blocked by required conditions Details Ubuntu / x86_64 (push) Waiting to run Details Ubuntu / aarch64 (push) Waiting to run Details Windows / build (push) Waiting to run Details	2024-11-08 21:41:27 +00:00
Rayyan Ansari	adf143a38d	Fix link to contributors in About dialog Add openExternalLinks property to the label to allow the hyperlink to open in the user's web browser.	2024-11-08 21:32:45 +00:00
RSDuck	8d4f419546	correct assert in gdb stub	2024-11-08 18:57:44 +01:00