mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2026-01-29 09:28:15 +03:00
Remove NO_EDITOR/NO_CUSTOM_LEVELS, disable editor on Steam Deck
This commit removes the `NO_EDITOR` and `NO_CUSTOM_LEVELS` defines, which cleans up the code a lot, and they weren't really needed anyways. This commit also disables the editor on the Steam Deck, and adds a program argument to re-enable the editor, `-enable-editor`.
This commit is contained in:
committed by
Misa Elizabeth Kai
parent
880c7ad8e6
commit
a537492d9c
46
.github/workflows/ci.yml
vendored
46
.github/workflows/ci.yml
vendored
@@ -46,20 +46,6 @@ jobs:
|
||||
- name: Build (M&P)
|
||||
run: ninja -C ${SRC_DIR_PATH}/build
|
||||
|
||||
- name: CMake configure (no custom levels)
|
||||
run: |
|
||||
cd ${SRC_DIR_PATH}/build
|
||||
cmake -DMAKEANDPLAY=OFF -DCUSTOM_LEVEL_SUPPORT=DISABLED ..
|
||||
- name: Build (no custom levels)
|
||||
run: ninja -C ${SRC_DIR_PATH}/build
|
||||
|
||||
- name: CMake configure (no editor)
|
||||
run: |
|
||||
cd ${SRC_DIR_PATH}/build
|
||||
cmake -DCUSTOM_LEVEL_SUPPORT=NO_EDITOR ..
|
||||
- name: Build (no editor)
|
||||
run: ninja -C ${SRC_DIR_PATH}/build
|
||||
|
||||
build-lin:
|
||||
name: Build (CentOS 7)
|
||||
|
||||
@@ -97,20 +83,6 @@ jobs:
|
||||
- name: Build (M&P)
|
||||
run: make -j $(nproc) -C ${SRC_DIR_PATH}/build
|
||||
|
||||
- name: CMake configure (no custom levels)
|
||||
run: |
|
||||
cd ${SRC_DIR_PATH}/build
|
||||
cmake -DMAKEANDPLAY=OFF -DCUSTOM_LEVEL_SUPPORT=DISABLED ..
|
||||
- name: Build (no custom levels)
|
||||
run: make -j $(nproc) -C ${SRC_DIR_PATH}/build
|
||||
|
||||
- name: CMake configure (no editor)
|
||||
run: |
|
||||
cd ${SRC_DIR_PATH}/build
|
||||
cmake -DCUSTOM_LEVEL_SUPPORT=NO_EDITOR ..
|
||||
- name: Build (no editor)
|
||||
run: make -j $(nproc) -C ${SRC_DIR_PATH}/build
|
||||
|
||||
build-win:
|
||||
name: Build (windows-latest)
|
||||
|
||||
@@ -186,21 +158,3 @@ jobs:
|
||||
run: |
|
||||
cd $env:SRC_DIR_PATH/build
|
||||
cmake --build .
|
||||
|
||||
- name: CMake configure (no custom levels)
|
||||
run: |
|
||||
cd $env:SRC_DIR_PATH/build
|
||||
cmake -DMAKEANDPLAY=OFF -DCUSTOM_LEVEL_SUPPORT=DISABLED ..
|
||||
- name: Build (no custom levels)
|
||||
run: |
|
||||
cd $env:SRC_DIR_PATH/build
|
||||
cmake --build .
|
||||
|
||||
- name: CMake configure (no editor)
|
||||
run: |
|
||||
cd $env:SRC_DIR_PATH/build
|
||||
cmake -DCUSTOM_LEVEL_SUPPORT=NO_EDITOR ..
|
||||
- name: Build (no editor)
|
||||
run: |
|
||||
cd $env:SRC_DIR_PATH/build
|
||||
cmake --build .
|
||||
|
||||
Reference in New Issue
Block a user