Merge branch 'main' into advanced-settings

Author: altalk23

.github/workflows/build.yml

@@ -6,119 +6,39 @@ on:
     branches:
       - '**'
 
-env:
-  GEODE_SDK: ${{ github.workspace }}/sdk
-  GEODE_VERSION: nightly
-  CLI_VERSION: v2.2.2
-  MOD_NAME: DevTools
-  MOD_ID: geode.devtools
-
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
         config:
-        - name: "Windows"
-          bin_folder: "windows"
-          os: windows-2019
-          extra_flags: '-T host=x64 -A win32'
-          out_paths:  './build/Release/*.dll'
-          platform_suffix: 'win'
+        - name: Windows
+          os: windows-latest
 
-        - name: "macOS"
-          bin_folder: "macos"
+        - name: macOS
           os: macos-latest
-          extra_flags: ""
-          out_paths: './build/*.dylib'
-          platform_suffix: 'mac'
-          
+
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
+      - uses: actions/checkout@v3
 
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-        repository: geode-sdk/geode
-        # ref: v0.4.8
-        path: ${{ env.GEODE_SDK }}
-     
-    - uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x86
+      - name: Build the mod
+        uses: geode-sdk/build-geode-mod@main
+        with:
+          combine: true
 
-    - name: Download Geode SDK binaries
-      run: |
-        cd ${{ github.workspace }}/sdk
-        mkdir bin
-        mkdir bin/nightly
-        cd bin/nightly
-        curl -L https://github.com/geode-sdk/geode/releases/download/${{ env.GEODE_VERSION }}/geode-${{ env.GEODE_VERSION }}-${{ matrix.config.platform_suffix }}.zip -o geode-sdk.zip
-        tar -xf geode-sdk.zip
-
-    - name: Configure CMake
-      run: |
-        cd ${{ github.workspace }}
-        cmake -B build ${{ matrix.config.extra_flags }} -DGEODE_DISABLE_CLI_CALLS=1
-    
-    - name: Build
-      run: |
-        cd ${{ github.workspace }}/build
-        cmake --build . --config Release
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: "build-${{ matrix.config.bin_folder }}"
-        path: "${{ matrix.config.out_paths }}"
-        
-        
   package:
-    name: "Package both builds"
-    # would use linux but theres no cli build for it
-    runs-on: windows-2019
+    name: Package builds
+    runs-on: ubuntu-latest
     needs: ['build']
-    
-    steps:          
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      
-      - name: Download and Unzip CLI
-        run: |
-          curl -L https://github.com/geode-sdk/cli/releases/download/${{ env.CLI_VERSION }}/geode-cli-${{ env.CLI_VERSION }}-win.zip -o geode-cli.zip
-          tar -xf geode-cli.zip
 
-      - uses: actions/download-artifact@v3
-        with:
-          name: build-windows
-          
-      - uses: actions/download-artifact@v3
-        with:
-          name: build-macos
-      
-      - name: Merge
-        shell: bash
-        run: |
-          mv $MOD_NAME.dll $MOD_ID.dll
-          mv lib$MOD_NAME.dylib $MOD_ID.dylib
-          ./geode.exe package new . --binary $MOD_ID.dll --binary $MOD_ID.dylib --output $MOD_ID.geode
-         
+    steps:
+      - uses: geode-sdk/build-geode-mod@combine
+        id: build
+
       - uses: actions/upload-artifact@v3
         with:
           name: Build Output
-          path: "${{ env.MOD_ID }}.geode"
-          
-      - uses: geekyeggo/delete-artifact@v2
-        with:
-            name: build-windows
-            failOnError: false
-          
-      - uses: geekyeggo/delete-artifact@v2
-        with:
-            name: build-macos
-            failOnError: false
+          path: ${{ steps.build.outputs.build-output }}

CMakeLists.txt

@@ -18,10 +18,7 @@ else()
     message(STATUS "Found Geode: $ENV{GEODE_SDK}")
 endif()
 
-set(GEODE_LINK_NIGHTLY ON)
-add_subdirectory($ENV{GEODE_SDK} $ENV{GEODE_SDK}/build)
-
-include(cmake/CPM.cmake)
+add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
 
 CPMAddPackage("gh:ocornut/imgui#c191faf")
 
@@ -44,7 +41,8 @@ elseif(ANDROID)
     target_link_libraries(${PROJECT_NAME} GLESv2)
 endif()
 
+# i still dont like this (alk)
 target_compile_definitions(geode-sdk INTERFACE GEODE_EXPOSE_SECRET_INTERNALS_IN_HEADERS_DO_NOT_DEFINE_PLEASE)
 
-target_link_libraries(${PROJECT_NAME} geode-sdk)
-create_geode_file(${PROJECT_NAME})
+# Set up dependencies, resources, link Geode
+setup_geode_mod(${PROJECT_NAME})

mod.json

@@ -1,6 +1,6 @@
 {
 	"geode": "v1.0.0",
-	"version": "v1.1.1",
+	"version": "v1.2.0",
 	"id": "geode.devtools",
 	"name": "DevTools",
 	"developer": "Geode Team",

src/platform/platform.cpp

@@ -90,7 +90,7 @@ bool GLRenderCtx::begin() {
         );
         glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depth);
 
-        glFramebufferTextureEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, m_texture, 0);
+        glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_texture, 0);
     }
 
     if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {