Merge branch 'dev'

Author: Tetrapak0

.github/workflows/MSVC-x86_64.yml

@@ -0,0 +1,42 @@
+name: MSVC-x86_64.yml
+on:
+  push:
+    branches: [ "*" ]
+  pull_request:
+    branches: [ "*" ]
+
+env:
+  SOLUTION_FILE_PATH: ./Deckadence.sln
+
+  BUILD_CONFIGURATION: Release
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v1.0.2
+
+    - uses: abel0b/setup-premake@v2.4
+      with:
+        version: "5.0.0-beta7"
+
+    - name: Set up project
+      run: premake5 vs2022
+
+    - name: Build
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
+
+    - name: Upload a Build Artifact
+      uses: actions/upload-artifact@v4.6.2
+      with:
+        name: Deckadence.exe
+        path: ./bin/Win64/Release/Deckadence.exe
+        if-no-files-found: error

.gitignore

@@ -21,6 +21,10 @@ Server/.vs/
 .vscode/
 *.user
 *.aps
+*.vcxproj
+*.vcxproj.filters
+*.sln
+obj/
 
 # Misc.
 .idea/
@@ -31,4 +35,4 @@ Server/.vs/
 **/build/
 **/.cache/
 **/CMake/
-**/bin/
+**/bin/

CMakeLists.txt

@@ -29,7 +29,7 @@ file(GLOB_RECURSE NoWarnCpp ${CMAKE_CURRENT_LIST_DIR}/external/*.cpp)
 
 set_source_files_properties(${NoWarnCpp} PROPERTIES COMPILE_FLAGS "-w")
 
-add_executable(Deckadence ${DxSrc} ${ImSrc} ${NFDExSrc})
+add_executable(Deckadence ${DxSrc} ${ImSrc} ${NFDExSrc} ${CMAKE_CURRENT_LIST_DIR}/external/stb/stbi.c)
 set_property(TARGET Deckadence PROPERTY CXX_STANDARD 17)
 
 # must be ran with -DCMAKE_BUILD_TYPE=Debug
@@ -38,6 +38,8 @@ if (${CMAKE_BUILD_TYPE} MATCHES Debug)
 endif()
 
 if (WIN32)
+#    target_compile_options(Deckadence PRIVATE -Wl,--subsystem,windows)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,windows")
     target_link_libraries(Deckadence glfw3 opengl32 freetype dwmapi ws2_32 iphlpapi)
 elseif (UNIX AND NOT APPLE)
     find_package(PkgConfig REQUIRED)

Deckadence.rc

@@ -31,9 +31,13 @@
 - Debian-based: `sudo apt update && sudo apt install libfreetype-dev cmake build-essential clang libglfw3-dev libdbus-1-dev libgl1-dev libglu1-dev libx11-dev libxrandr-dev libwayland-dev`
 - Fedora-based: `sudo dnf upgrade --refresh && sudo dnf install freetype-dev cmake clang glfw-devel dbus dbus-devel mesa-libGL-devel mesa-libGLU-devel libx11-devel libxrandr-devel wayland-devel && sudo dnf groupinstall "Development Tools" "Development Libraries"`
 #### 2.2 Windows
-> ⚠ MSVC is not supported because Microsoft C++ is completely and utterly repugnant and should be EOL'd. Even their devs hate using it. It's true. ⚠
->
-> During development for Windows, Deckadence is only built using clang++ via MSYS for the aforementioned reasons.
+##### MSVC / Visual Studio
+1. Download [Premake](https://premake.github.io/)
+2. Install [Git](https://git-scm.com/downloads)
+3. Run `git clone https://github.com/Tetrapak0/Deckadence`
+4. Open the cloned repository and run `premake5 vs2022` (make sure premake is in your PATH)
+5. Open `Deckadence.sln` and build
+##### MSYS / clang
 1. Install MSYS2 from https://www.msys2.org/
 2. Open the Clang64 environment and run the following commands to install dependencies:
     > Note that you may be asked to quit the session to update packages. In that case, please re-run the last command.

README.md

@@ -21,6 +21,7 @@
 #include <poll.h>
 #include <fcntl.h>
 #include <ifaddrs.h>
+#include <net/if.h>
 
 #include <errno.h>
 #endif

external/GLFW/lib/glfw3.dll

@@ -836,8 +836,9 @@ static void ImGui_ImplGlfw_UpdateMouseCursor()
         {
             // Show OS mouse cursor
             // FIXME-PLATFORM: Unfocused windows seems to fail changing the mouse cursor with GLFW 3.2, but 3.3 works here.
-            glfwSetCursor(window, bd->MouseCursors[imgui_cursor] ? bd->MouseCursors[imgui_cursor] : bd->MouseCursors[ImGuiMouseCursor_Arrow]);
-            glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
+            // commented out by Tetrapak0. Just let me hide my cursor man
+            // glfwSetCursor(window, bd->MouseCursors[imgui_cursor] ? bd->MouseCursors[imgui_cursor] : bd->MouseCursors[ImGuiMouseCursor_Arrow]);
+            // glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
         }
     }
 }

external/GLFW/lib/glfw3dll.lib

@@ -0,0 +1,7 @@
+#define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_RESIZE_IMPLEMENTATION
+#define STB_IMAGE_RESIZE2_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "stb_image.h"
+#include "stb_image_resize2.h"
+#include "stb_image_write.h"