Merge branch 'master' into sound-v2

Author: BrentDaMage

.github/workflows/build.yml

@@ -6,38 +6,33 @@ on:
 
 jobs:
     linux:
-        strategy:
-            fail-fast: false
-            matrix:
-                include:
-                  - name: OpenGL ES
-                    flags: "-DUSE_GLES1_COMPATIBILITY_LAYER=ON"
-                  - name: OpenGL
-                    flags: "-DUSE_GLES1_COMPATIBILITY_LAYER=OFF"
-        name: Linux (${{ matrix.name }})
+        name: Linux
         runs-on: ubuntu-latest
         steps:
           - name: Checkout Repository
-            uses: actions/checkout@v3
+            uses: actions/checkout@v4
             with:
                 submodules: true
           - name: Install Dependencies
             run: |
                 sudo apt-get update
-                sudo apt-get install --no-install-recommends -y build-essential cmake ninja-build libopenal-dev libsdl2-dev zlib1g-dev
+                sudo apt-get install --no-install-recommends -y \
+                    build-essential \
+                    cmake ninja-build \
+                    libopenal-dev \
+                    libsdl2-dev zlib1g-dev
           - name: Build
             run: |
-                cd platforms/sdl
                 mkdir build
                 cd build
-                cmake -GNinja ${{ matrix.flags }} ..
+                cmake -GNinja ..
                 cmake --build .
     wasm:
         name: WASM
         runs-on: ubuntu-latest
         steps:
           - name: Checkout Repository
-            uses: actions/checkout@v3
+            uses: actions/checkout@v4
             with:
                 submodules: true
           - name: Install Dependencies
@@ -51,15 +46,16 @@ jobs:
         runs-on: macos-latest
         steps:
           - name: Checkout Repository
-            uses: actions/checkout@v3
+            uses: actions/checkout@v4
             with:
                 submodules: true
           - name: Install MacPorts
             uses: melusina-org/setup-macports@v1
           - name: Install Dependencies
             run: |
-                sudo port install libsdl2 +universal
-                sudo port install libpng +universal
+                port selfupdate
+                port install libsdl2 +universal
+                port install libpng +universal
           - name: Build macOS Archive
             run: |
                 cd platforms/macos/projects/Minecraft
@@ -103,11 +99,11 @@ jobs:
         runs-on: ubuntu-latest
         steps:
           - name: Checkout Repository
-            uses: actions/checkout@v3
+            uses: actions/checkout@v4
             with:
                 submodules: true
           - name: Setup JDK
-            uses: actions/setup-java@v3
+            uses: actions/setup-java@v4
             with:
                 java-version: '17'
                 distribution: 'temurin'
@@ -116,3 +112,32 @@ jobs:
             run: |
                 cd ${{ matrix.directory }}
                 ./gradlew build
+    mingw:
+      strategy:
+        fail-fast: false
+        matrix:
+          include:
+            - name: Win32
+              flags: "-DREMCPE_PLATFORM=windows"
+            - name: SDL
+              flags: "-DREMCPE_PLATFORM=sdl"
+      name: MinGW-w64 (${{ matrix.name }})
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout Repository
+          uses: actions/checkout@v4
+          with:
+            submodules: true
+        - name: Install Dependencies
+          run: |
+            sudo apt-get update
+            sudo apt-get install --no-install-recommends -y \
+                build-essential \
+                cmake ninja-build \
+                mingw-w64
+        - name: Build
+          run: |
+            mkdir build
+            cd build
+            cmake -GNinja -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw-w64-toolchain.cmake ${{ matrix.flags }} ..
+            cmake --build .

.gitignore

@@ -211,6 +211,9 @@ xcuserdata/
 /game/assets/gui/touchgui2.png
 /game/assets/item/arrows.png
 /game/assets/item/sign.png
+# Sound
+/game/assets/sound
+/game/assets/music
 # Java
 /game/assets/terrain/sun.png
 /game/assets/terrain/moon.png
@@ -242,17 +245,11 @@ xcuserdata/
 # Ignore options.txt - where your configuration will be saved
 /game/options.txt
 /game/assetsO
-/game/assets/gui/feedback_fill.png
-/game/assets/gui/feedback_outer.png
-/game/assets/snow.png
-/game/assets/mob/pig.png
 
 # CLion
 /.idea
-cmake-build-*
+/cmake-build-*
 
-# Sound
+# PCM sound extraction
 /tools/__pycache__
 /tools/venv
-/game/assets/sound
-/game/assets/music

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "thirdparty/coi-serviceworker"]
 	path = thirdparty/coi-serviceworker
 	url = https://github.com/gzuidhof/coi-serviceworker.git
-[submodule "thirdparty/gles-compatibility-layer"]
-	path = thirdparty/gles-compatibility-layer
-	url = https://github.com/TheBrokenRail/gles-compatibility-layer.git
 [submodule "thirdparty/SDL-src"]
 	path = thirdparty/SDL2/src
 	url = https://github.com/libsdl-org/SDL.git

CMakeLists.txt

@@ -0,0 +1,64 @@
+cmake_minimum_required(VERSION 3.16.0)
+project(reminecraftpe)
+
+# Store Output In Top-Level Build Directory
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+
+# WASM
+if(EMSCRIPTEN)
+    function(add_compile_and_link_options)
+        add_compile_options(${ARGV})
+        add_link_options(${ARGV})
+    endfunction()
+    set(CMAKE_EXECUTABLE_SUFFIX ".js")
+    add_link_options("$<$<CONFIG:DEBUG>:-gsource-map>")
+    add_link_options(-Wno-pthreads-mem-growth -sALLOW_MEMORY_GROWTH=1)
+endif()
+
+# Clang
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    add_compile_options(-Wno-inconsistent-missing-override -Wno-enum-compare-switch -Wno-register)
+endif()
+
+# Windows Linking
+if(WIN32)
+    add_link_options(
+        -static-libgcc
+        -static-libstdc++
+    )
+endif()
+
+# HaikuOS Network Library
+if(HAIKU)
+    link_libraries(network)
+endif()
+
+# Threading
+if(EMSCRIPTEN)
+    add_compile_and_link_options(-pthread)
+else()
+    find_package(Threads)
+    link_libraries(Threads::Threads)
+endif()
+
+# Android Logging
+if(ANDROID)
+    link_libraries(log)
+endif()
+
+# stb_image And Other Libraries
+add_subdirectory(thirdparty/stb_image EXCLUDE_FROM_ALL)
+
+# Load Common Code
+add_subdirectory(source)
+
+# Load Platform-Specific Code
+add_subdirectory(platforms)
+
+# Assets
+if(EMSCRIPTEN)
+    target_link_options(reminecraftpe PRIVATE --use-preload-plugins --preload-file "${CMAKE_CURRENT_SOURCE_DIR}/game@/")
+else()
+    file(CREATE_LINK "${CMAKE_CURRENT_SOURCE_DIR}/game/assets" "${CMAKE_CURRENT_BINARY_DIR}/assets" SYMBOLIC)
+endif()