From e037bc34611e58accc695e16680c8272d13ba5da Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 16:53:24 -0700 Subject: [PATCH 01/12] remove deployment code from CMake --- Projects/Client/Player/CMakeLists.txt | 7 ------- Projects/Client/Server/CMakeLists.txt | 7 ------- Projects/Client/Studio/CMakeLists.txt | 12 +----------- Projects/Engine/CMakeLists.txt | 16 +--------------- 4 files changed, 2 insertions(+), 40 deletions(-) diff --git a/Projects/Client/Player/CMakeLists.txt b/Projects/Client/Player/CMakeLists.txt index 868164f..798c405 100644 --- a/Projects/Client/Player/CMakeLists.txt +++ b/Projects/Client/Player/CMakeLists.txt @@ -18,13 +18,6 @@ endif() qt_add_executable(Player ${SOURCE} ${HEADER}) -if(MINGW) - add_custom_command(TARGET Player POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy -t $ $ - COMMAND_EXPAND_LISTS - ) -endif() - target_include_directories(Player PRIVATE Header) target_link_libraries(Player PRIVATE Common Engine) diff --git a/Projects/Client/Server/CMakeLists.txt b/Projects/Client/Server/CMakeLists.txt index f47982f..9b42ddc 100644 --- a/Projects/Client/Server/CMakeLists.txt +++ b/Projects/Client/Server/CMakeLists.txt @@ -9,12 +9,5 @@ endif() add_executable(Server ${SOURCE} ${HEADER}) -if(MINGW) - add_custom_command(TARGET Server POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy -t $ $ - COMMAND_EXPAND_LISTS - ) -endif() - target_include_directories(Server PRIVATE Header) target_link_libraries(Server PRIVATE Engine) \ No newline at end of file diff --git a/Projects/Client/Studio/CMakeLists.txt b/Projects/Client/Studio/CMakeLists.txt index 6866b77..d484964 100644 --- a/Projects/Client/Studio/CMakeLists.txt +++ b/Projects/Client/Studio/CMakeLists.txt @@ -20,20 +20,10 @@ endif() qt_add_executable(Studio ${SOURCE} ${HEADER}) -if(MINGW) - add_custom_command(TARGET Studio POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy -t $ $ - COMMAND_EXPAND_LISTS - ) -endif() - target_include_directories(Studio PRIVATE Header) target_link_libraries(Studio PRIVATE Common Engine) set_target_properties(Studio PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON -) - -install(TARGETS Studio - RUNTIME_DEPENDENCIES) \ No newline at end of file +) \ No newline at end of file diff --git a/Projects/Engine/CMakeLists.txt b/Projects/Engine/CMakeLists.txt index 8b60705..58e9803 100644 --- a/Projects/Engine/CMakeLists.txt +++ b/Projects/Engine/CMakeLists.txt @@ -51,18 +51,4 @@ add_library(Engine STATIC find_package(pugixml REQUIRED) target_include_directories(Engine PUBLIC ${BOOST_INCLUDE_DIRS} Header/) -target_link_libraries(Engine PUBLIC ${BOOST_LIBRARIES} pugixml OgreBites Luau.Analysis Luau.Ast Luau.Compiler Luau.VM) - -if(WIN32 OR MINGW) - file(COPY ${CMAKE_SOURCE_DIR}/Content/win32_plugins.cfg DESTINATION ${CMAKE_BINARY_DIR}) - file(RENAME ${CMAKE_BINARY_DIR}/win32_plugins.cfg ${CMAKE_BINARY_DIR}/plugins.cfg) - file(COPY ${OGRE_PLUGIN_DIR}/ DESTINATION ${CMAKE_BINARY_DIR}/plugins) -elseif(UNIX) - file(COPY ${CMAKE_SOURCE_DIR}/Content/linux_plugins.cfg DESTINATION ${CMAKE_BINARY_DIR}) - file(RENAME ${CMAKE_BINARY_DIR}/linux_plugins.cfg ${CMAKE_BINARY_DIR}/plugins.cfg) - file(COPY ${OGRE_PLUGIN_DIR}/ DESTINATION ${CMAKE_BINARY_DIR}/plugins) -endif() - -file(COPY ${CMAKE_SOURCE_DIR}/Content/RNR/ DESTINATION ${CMAKE_BINARY_DIR}/content) -file(COPY ${OGRE_MEDIA_DIR}/Main/ DESTINATION ${CMAKE_BINARY_DIR}/shaders) -file(COPY ${OGRE_MEDIA_DIR}/RTShaderLib/ DESTINATION ${CMAKE_BINARY_DIR}/shaders) \ No newline at end of file +target_link_libraries(Engine PUBLIC ${BOOST_LIBRARIES} pugixml OgreBites Luau.Analysis Luau.Ast Luau.Compiler Luau.VM) \ No newline at end of file From ae531106e9cc39bcf870e0be5c7f3008dc72a7ef Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 16:56:47 -0700 Subject: [PATCH 02/12] update requirements --- CMakeLists.txt | 1 + Projects/Engine/CMakeLists.txt | 2 -- README.md | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33e7535..d52826e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,5 +15,6 @@ add_compile_options(-Wno-attributes -Wno-return-type) # Ignore warnings generate find_package(Boost REQUIRED) find_package(OGRE REQUIRED COMPONENTS Bites CONFIG) +find_package(pugixml REQUIRED) add_subdirectory(Projects) \ No newline at end of file diff --git a/Projects/Engine/CMakeLists.txt b/Projects/Engine/CMakeLists.txt index 58e9803..644915a 100644 --- a/Projects/Engine/CMakeLists.txt +++ b/Projects/Engine/CMakeLists.txt @@ -48,7 +48,5 @@ add_library(Engine STATIC Source/Rendering/Adorn.cpp ) -find_package(pugixml REQUIRED) - target_include_directories(Engine PUBLIC ${BOOST_INCLUDE_DIRS} Header/) target_link_libraries(Engine PUBLIC ${BOOST_LIBRARIES} pugixml OgreBites Luau.Analysis Luau.Ast Luau.Compiler Luau.VM) \ No newline at end of file diff --git a/README.md b/README.md index 9ebfe02..38bef1e 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,8 @@ There are several goals that RNR seeks to accomplish, them being; # Building RNR uses [CMake](https://cmake.org/) as its build system and [GCC](https://gcc.gnu.org/) as its compiler. To build RNR, you must first have the following packages installed: - [Boost](https://www.boost.org/) -- [Ogre](https://github.com/OGRECave/ogre) +- [OGRE](https://github.com/OGRECave/ogre) +- [pugixml](https://github.com/zeux/pugixml) - [Qt 6](https://www.qt.io/product/qt6) (if building the player or studio projects) For Windows: From f84cf0b2fd371c81c5c085fdf16c4ef057341080 Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 17:57:26 -0700 Subject: [PATCH 03/12] add windows builds(?) --- .github/workflows/ci.yml | 59 +++++++++++++++++++++++++++++++++++++++ Content/linux_plugins.cfg | 35 +++++++---------------- Content/win32_plugins.cfg | 36 ++++++++---------------- 3 files changed, 80 insertions(+), 50 deletions(-) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..1b25034 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,59 @@ +name: CI +on: [push] + +jobs: + build-windows: + strategy: + matrix: + configuration: [Release, Debug] + + name: Build (Windows) + runs-on: windows-latest + + defaults: + run: + shell: msys2 {0} + + steps: + - uses: actions/checkout@v3 + + - uses: msys2/setup-msys2@v2 + name: Set up MSYS2 + with: + update: true + msystem: mingw64 + install: >- + mingw-w64-x86_64-cmake + mingw-w64-x86_64-ninja + mingw-w64-x86_64-boost + mingw-w64-x86_64-pugixml + mingw-w64-x86_64-ogre + mingw-w64-x86_64-qt + + - name: Generate CMake build files + run: cmake -G Ninja -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration == 'Release' && 'MinSizeRel' || matrix.configuration }} . + + - name: Build + run: ninja -C build + + - name: Organize binaries + run: mkdir build/dist && mv build/*.exe build/dist && cd build/dist && for x in *.exe; do mv $x "RNR.$x"; done && cd ../../ + + - name: Add Qt dependencies + run: windeployqt6 build/dist/*.exe + + # ouch - unless and until we start using CMake's install command, these commands are a necessary evil + - name: Add runtime dependencies + run: ldd build/dist/*.exe | grep "=> /" | awk '{print $3}' | grep "mingw64" | xargs -I '{}' cp -v '{}' build/dist + + - name: Add OGRE plugins + run: cp Content/win32_plugins.cfg build/dist/plugins.cfg && mkdir build/dist/plugins/ && cat build/dist/plugins.cfg | grep "Plugin=" | sed -e "s/Plugin=//" | xargs -I '{}' cp -v '/mingw64/bin/{}.dll' build/dist/plugins/ + + - name: Add resources + run: cp -R Content/RNR build/dist/content && cp LICENSE build/dist + + - name: Upload + uses: actions/upload-artifact@v3 + with: + name: RNR for Windows (${{ matrix.configuration }}) + path: build/dist \ No newline at end of file diff --git a/Content/linux_plugins.cfg b/Content/linux_plugins.cfg index b8eb61d..8bb32f8 100644 --- a/Content/linux_plugins.cfg +++ b/Content/linux_plugins.cfg @@ -1,27 +1,12 @@ -# Defines plugins to load - -# Define plugin folder PluginFolder=/usr/lib/OGRE -# Define plugins -# Plugin=RenderSystem_Direct3D9 -# Plugin=RenderSystem_Direct3D11 - Plugin=RenderSystem_GL - Plugin=RenderSystem_GL3Plus - Plugin=RenderSystem_GLES2 -# Plugin=RenderSystem_Metal -# Plugin=RenderSystem_Tiny -# Plugin=RenderSystem_Vulkan - Plugin=Plugin_ParticleFX - Plugin=Plugin_BSPSceneManager -# Plugin=Plugin_CgProgramManager -# Plugin=Plugin_GLSLangProgramManager -# Plugin=Codec_EXR - Plugin=Codec_STBI -# Plugin=Codec_RsImage -# Plugin=Codec_FreeImage - Plugin=Plugin_PCZSceneManager - Plugin=Plugin_OctreeZone - Plugin=Plugin_OctreeSceneManager - Plugin=Plugin_DotScene -# Plugin=Codec_Assimp +Plugin=RenderSystem_GL +Plugin=RenderSystem_GL3Plus +Plugin=RenderSystem_GLES2 +Plugin=Plugin_ParticleFX +Plugin=Plugin_BSPSceneManager +Plugin=Codec_STBI +Plugin=Plugin_PCZSceneManager +Plugin=Plugin_OctreeZone +Plugin=Plugin_OctreeSceneManager +Plugin=Plugin_DotScene \ No newline at end of file diff --git a/Content/win32_plugins.cfg b/Content/win32_plugins.cfg index 20178ba..c00fda7 100644 --- a/Content/win32_plugins.cfg +++ b/Content/win32_plugins.cfg @@ -1,27 +1,13 @@ -# Defines plugins to load - -# Define plugin folder PluginFolder=plugins -# Define plugins - Plugin=RenderSystem_Direct3D9 - Plugin=RenderSystem_Direct3D11 - Plugin=RenderSystem_GL - Plugin=RenderSystem_GL3Plus - Plugin=RenderSystem_GLES2 -# Plugin=RenderSystem_Metal -# Plugin=RenderSystem_Tiny -# Plugin=RenderSystem_Vulkan - Plugin=Plugin_ParticleFX - Plugin=Plugin_BSPSceneManager -# Plugin=Plugin_CgProgramManager -# Plugin=Plugin_GLSLangProgramManager -# Plugin=Codec_EXR - Plugin=Codec_STBI -# Plugin=Codec_RsImage -# Plugin=Codec_FreeImage - Plugin=Plugin_PCZSceneManager - Plugin=Plugin_OctreeZone - Plugin=Plugin_OctreeSceneManager -# Plugin=Plugin_DotScene -# Plugin=Codec_Assimp +Plugin=RenderSystem_Direct3D9 +Plugin=RenderSystem_Direct3D11 +Plugin=RenderSystem_GL +Plugin=RenderSystem_GL3Plus +Plugin=RenderSystem_GLES2 +Plugin=Plugin_ParticleFX +Plugin=Plugin_BSPSceneManager +Plugin=Codec_STBI +Plugin=Plugin_PCZSceneManager +Plugin=Plugin_OctreeZone +Plugin=Plugin_OctreeSceneManager \ No newline at end of file From 202a3aaf3feabaeb7ce20a8f763dbd23ab547c1f Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 17:59:07 -0700 Subject: [PATCH 04/12] fix required packages in ci --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b25034..420c980 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,8 +27,8 @@ jobs: mingw-w64-x86_64-ninja mingw-w64-x86_64-boost mingw-w64-x86_64-pugixml - mingw-w64-x86_64-ogre - mingw-w64-x86_64-qt + mingw-w64-x86_64-ogre3d + mingw-w64-x86_64-qt6 - name: Generate CMake build files run: cmake -G Ninja -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration == 'Release' && 'MinSizeRel' || matrix.configuration }} . From 52ba019f43985e57bdf1ed1ef34c906c5d66a823 Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 18:05:01 -0700 Subject: [PATCH 05/12] ci: oops --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 420c980..5e3772c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,7 @@ jobs: update: true msystem: mingw64 install: >- + mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-boost From 56a7c008ac41e14fd8029a25972cbcf7581c7941 Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 18:12:43 -0700 Subject: [PATCH 06/12] ci: clone submodules --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e3772c..f9308b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,9 @@ jobs: steps: - uses: actions/checkout@v3 - + with: + submodules: recursive + - uses: msys2/setup-msys2@v2 name: Set up MSYS2 with: From c4277163ff45ccb080815423319e3e0c9f8dd579 Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 18:28:28 -0700 Subject: [PATCH 07/12] ci: semantics --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9308b6..a9b1196 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,7 @@ jobs: steps: - uses: actions/checkout@v3 + name: Clone repository with: submodules: recursive @@ -33,10 +34,10 @@ jobs: mingw-w64-x86_64-ogre3d mingw-w64-x86_64-qt6 - - name: Generate CMake build files + - name: Generate Ninja build files run: cmake -G Ninja -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration == 'Release' && 'MinSizeRel' || matrix.configuration }} . - - name: Build + - name: Build (Ninja) run: ninja -C build - name: Organize binaries From 294cbbccbc37d5b9116f52a48ce5023556b565af Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 18:35:06 -0700 Subject: [PATCH 08/12] ci: improvements and such --- .github/workflows/ci.yml | 7 +++---- README.md | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9b1196..3f3a8be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ jobs: build-windows: strategy: matrix: - configuration: [Release, Debug] + configuration: [release, debug] name: Build (Windows) runs-on: windows-latest @@ -23,7 +23,6 @@ jobs: - uses: msys2/setup-msys2@v2 name: Set up MSYS2 with: - update: true msystem: mingw64 install: >- mingw-w64-x86_64-gcc @@ -35,7 +34,7 @@ jobs: mingw-w64-x86_64-qt6 - name: Generate Ninja build files - run: cmake -G Ninja -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration == 'Release' && 'MinSizeRel' || matrix.configuration }} . + run: cmake -G Ninja -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration == 'release' && 'MinSizeRel' || 'Debug' }} . - name: Build (Ninja) run: ninja -C build @@ -59,5 +58,5 @@ jobs: - name: Upload uses: actions/upload-artifact@v3 with: - name: RNR for Windows (${{ matrix.configuration }}) + name: RNR (win_x64-${{ matrix.configuration }}-${{ github.sha }}) path: build/dist \ No newline at end of file diff --git a/README.md b/README.md index 38bef1e..0962b94 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # RNR +[![GitHub CI Status](https://img.shields.io/github/actions/workflow/status/lrre-foss/rnr/ci.yml?branch=trunk&label=builds)](https://github.com/lrre-foss/rnr/actions) [![Star](https://img.shields.io/github/stars/lrre-foss/RNR?style=social)](https://github.com/lrre-foss/RNR/stargazers) RNR (**R**NR's **N**ot **R**oblox) is a project that aims to recreate the look and feel of classic Roblox with new features while remaining fully compatible with clients from that era. It is built upon an engine that closely resembles Roblox's own at the time, referencing disassemblies of legacy client binaries. From a2f9a1b5ba81c9628a4cb2e95673db3ed1cadc6e Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 18:40:47 -0700 Subject: [PATCH 09/12] ci: hotfixes --- .github/workflows/ci.yml | 7 +++++-- Content/win32_plugins.cfg | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f3a8be..a96379f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,19 +39,22 @@ jobs: - name: Build (Ninja) run: ninja -C build + # ouch - unless and until we start using CMake's install command, these commands are a necessary evil - name: Organize binaries run: mkdir build/dist && mv build/*.exe build/dist && cd build/dist && for x in *.exe; do mv $x "RNR.$x"; done && cd ../../ - name: Add Qt dependencies run: windeployqt6 build/dist/*.exe - # ouch - unless and until we start using CMake's install command, these commands are a necessary evil - name: Add runtime dependencies run: ldd build/dist/*.exe | grep "=> /" | awk '{print $3}' | grep "mingw64" | xargs -I '{}' cp -v '{}' build/dist - name: Add OGRE plugins run: cp Content/win32_plugins.cfg build/dist/plugins.cfg && mkdir build/dist/plugins/ && cat build/dist/plugins.cfg | grep "Plugin=" | sed -e "s/Plugin=//" | xargs -I '{}' cp -v '/mingw64/bin/{}.dll' build/dist/plugins/ - + + - name: Add OGRE shaders + run: mkdir build/dist/ShaderCache && mkdir build/dist/shaders && cp -R /mingw64/share/OGRE/Media/Main build/dist/shaders && cp -R /mingw64/share/OGRE/Media/RTShaderLib build/dist/shaders + - name: Add resources run: cp -R Content/RNR build/dist/content && cp LICENSE build/dist diff --git a/Content/win32_plugins.cfg b/Content/win32_plugins.cfg index c00fda7..dd1f5f5 100644 --- a/Content/win32_plugins.cfg +++ b/Content/win32_plugins.cfg @@ -1,7 +1,7 @@ PluginFolder=plugins -Plugin=RenderSystem_Direct3D9 -Plugin=RenderSystem_Direct3D11 +# Plugin=RenderSystem_Direct3D9 +# Plugin=RenderSystem_Direct3D11 Plugin=RenderSystem_GL Plugin=RenderSystem_GL3Plus Plugin=RenderSystem_GLES2 From 2e6bc77716553eaaed82f7e1230eda3ad0049b73 Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 18:46:37 -0700 Subject: [PATCH 10/12] ci: moar semantics (lol) --- .github/workflows/ci.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a96379f..db88e45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,13 +1,12 @@ -name: CI on: [push] jobs: - build-windows: + build-win_x64: strategy: matrix: configuration: [release, debug] - name: Build (Windows) + name: build (win_x64) runs-on: windows-latest defaults: @@ -39,7 +38,7 @@ jobs: - name: Build (Ninja) run: ninja -C build - # ouch - unless and until we start using CMake's install command, these commands are a necessary evil + # ouch - unless and until we start using CMake's install command, these next few commands are a necessary evil - name: Organize binaries run: mkdir build/dist && mv build/*.exe build/dist && cd build/dist && for x in *.exe; do mv $x "RNR.$x"; done && cd ../../ @@ -58,8 +57,12 @@ jobs: - name: Add resources run: cp -R Content/RNR build/dist/content && cp LICENSE build/dist + - name: Set output variables + id: vars + run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + - name: Upload uses: actions/upload-artifact@v3 with: - name: RNR (win_x64-${{ matrix.configuration }}-${{ github.sha }}) + name: RNR (${{ steps.vars.outputs.sha_short }}-${{ matrix.configuration }}-win_x64) path: build/dist \ No newline at end of file From 4b2b72fc3b523d6ce39da1fe4c7109f521d0f354 Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 18:47:25 -0700 Subject: [PATCH 11/12] ci: AHHHHH --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db88e45..e7d82f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,3 +1,4 @@ +name: ci on: [push] jobs: From fe784681fcb621d66008cb7ef40051fd8314ae46 Mon Sep 17 00:00:00 2001 From: rj Date: Mon, 17 Jul 2023 19:19:48 -0700 Subject: [PATCH 12/12] Update win32_plugins.cfg --- Content/win32_plugins.cfg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Content/win32_plugins.cfg b/Content/win32_plugins.cfg index dd1f5f5..36d176b 100644 --- a/Content/win32_plugins.cfg +++ b/Content/win32_plugins.cfg @@ -1,7 +1,5 @@ PluginFolder=plugins -# Plugin=RenderSystem_Direct3D9 -# Plugin=RenderSystem_Direct3D11 Plugin=RenderSystem_GL Plugin=RenderSystem_GL3Plus Plugin=RenderSystem_GLES2 @@ -10,4 +8,4 @@ Plugin=Plugin_BSPSceneManager Plugin=Codec_STBI Plugin=Plugin_PCZSceneManager Plugin=Plugin_OctreeZone -Plugin=Plugin_OctreeSceneManager \ No newline at end of file +Plugin=Plugin_OctreeSceneManager