From 806d47ba9d5af3cb6c1976003f6746fafe2533c2 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sun, 24 Nov 2024 15:38:27 -0500 Subject: [PATCH] disable WITH_DEMOS by default due to unclear licensing --- CMakeLists.txt | 2 +- README.md | 2 +- demos/README.md | 133 ++++++++++++++++++++++++++++++++++++++++++++++ src/gui/about.cpp | 132 --------------------------------------------- 4 files changed, 135 insertions(+), 134 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8405999d..67d2db363 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,7 +131,7 @@ option(SYSTEM_ZLIB "Use a system-installed version of zlib instead of the vendor option(SYSTEM_SDL2 "Use a system-installed version of SDL2 instead of the vendored one" ${SYSTEM_SDL2_DEFAULT}) option(SUPPORT_XP "Build a Windows XP-compatible binary" OFF) option(WARNINGS_ARE_ERRORS "Whether warnings in furnace's C++ code should be treated as errors" OFF) -option(WITH_DEMOS "Install demo songs" ON) +option(WITH_DEMOS "Install demo songs (NOTE: demo songs are NOT under GPL!)" OFF) option(WITH_INSTRUMENTS "Install instruments" ON) option(WITH_WAVETABLES "Install wavetables" ON) option(SHOW_OPEN_ASSETS_MENU_ENTRY "Show option to open built-in assets directory (on supported platforms)" OFF) diff --git a/README.md b/README.md index a45b3a31b..8e7fe6c89 100644 --- a/README.md +++ b/README.md @@ -282,7 +282,7 @@ Available options: | `SYSTEM_FREETYPE` | `OFF` | Use a system-installed version of FreeType instead of the vendored one | | `SUPPORT_XP` | `OFF` | Build a Windows XP-compatible binary | | `WARNINGS_ARE_ERRORS` | `OFF`\*\* | Whether warnings in furnace's C++ code should be treated as errors | -| `WITH_DEMOS` | `ON` | Install demo songs on `make install` | +| `WITH_DEMOS` | `OFF` | Install demo songs on `make install` | | `WITH_INSTRUMENTS` | `ON` | Install demo instruments on `make install` | | `WITH_WAVETABLES` | `ON` | Install wavetables on `make install` | | `SHOW_OPEN_ASSETS_MENU_ENTRY` | `OFF` | Show option to open built-in assets directory (on supported platforms) | diff --git a/demos/README.md b/demos/README.md index eb2fced30..5f8962192 100644 --- a/demos/README.md +++ b/demos/README.md @@ -4,6 +4,139 @@ demo songs for Furnace. these demo songs are not under the GPL. all rights are reserved to the original author(s). +# contributors + +- 0x5066 +- Abstract 64 +- Aburtos +- ActualNK358 +- Aishi Tsukumo +- akumanatt +- aloelucidity +- AmigaX +- AquaDoesStuff +- AstralBlue +- Background2982 +- battybeats +- bbqzzd +- Bernie +- billimanmcjonnson +- BlastBrothers +- Blaze Weednix +- BlueElectric05 +- breakthetargets +- brickblock369 +- Brightonic +- Burnt Fishy +- CaptainMalware +- Clingojam +- ControlleronaHanger +- Crisps +- DeMOSic +- DevEd +- Dippy +- djtuBIG-MaliceX +- dmKaltsit +- Dolce +- dumbut +- Eggo1423 +- Eknous +- Electric Keet +- EntropyAuthor +- EpicTyphlosion +- Ether Egg +- FΛDE +- Forte +- Fragmare +- freq-mod +- gtr3qq +- Heemin +- Hortus +- ifrit05 +- iyatemu +- JayBOB18 +- Jimmy-DS +- Kagamiin~ +- Kaoru +- kleeder +- Korbo +- jaezu +- Laggy +- leejh20 +- LovelyA72 +- LTVA +- LunaMoth +- LVintageNerd +- Mahbod Karamoozian +- masicbemester +- MelonadeM +- Miker +- Molkirill +- MrCoolDude +- NeoWar +- Nerreave +- niffuM +- Nikku4211 +- \ +- Notakin +- nwcr +- NyaongI +- Pale Moon +- PeyPey +- PichuMario +- pixelated +- Poltvick +- PotaJoe +- potatoTeto +- psxdominator +- Raijin +- railzen7 +- Rancastor +- Rei8bit +- RepellantMold +- RetroCarrot +- RevvoBolt +- Rockyfan75000 +- Roostersox +- scooblee +- sheffield^2 +- sillygoose +- Slightly Large NC +- smaybius +- SnugglyBun +- Someone64 +- Spinning Square Waves +- src3453 +- SuperJet Spade +- Supper\_E1 +- SwapXFO +- Swirly +- System64 +- TakuikaNinja +- tapekeep +- TapeStone +- TCORPStudios +- Teuthida +- ThaCuber +- The Blender Fiddler +- TheDuccinator +- theloredev +- The Beesh-Spweesh! +- TheRealHedgehogSonic +- tildearrow +- tom\_atom +- traumatized +- Tytanium654 +- Ultraprogramer +- UserSniper +- Weeppiko +- Wegfrei +- Xan +- Yuzu4K +- Zabir +- Zaxolotl +- ZoomTen (Zumi) + # submit demo songs! contact me or send a pull request if you want your song to be added to this collection. be noted we have three rules: diff --git a/src/gui/about.cpp b/src/gui/about.cpp index 9144332f1..ec651e429 100644 --- a/src/gui/about.cpp +++ b/src/gui/about.cpp @@ -81,138 +81,6 @@ const char* aboutLine[]={ "Svenska: RevvoBolt", "ไทย: akumanatt", "", - _N("-- demo songs --"), - "0x5066", - "Abstract 64", - "Aburtos", - "ActualNK358", - "Aishi Tsukumo", - "akumanatt", - "aloelucidity", - "AmigaX", - "AquaDoesStuff", - "AstralBlue", - "Background2982", - "battybeats", - "bbqzzd", - "Bernie", - "billimanmcjonnson", - "BlastBrothers", - "Blaze Weednix", - "BlueElectric05", - "breakthetargets", - "brickblock369", - "Brightonic", - "Burnt Fishy", - "CaptainMalware", - "Clingojam", - "ControlleronaHanger", - "Crisps", - "DeMOSic", - "DevEd", - "Dippy", - "djtuBIG-MaliceX", - "dmKaltsit", - "Dolce", - "dumbut", - "Eggo1423", - "Eknous", - "Electric Keet", - "EntropyAuthor", - "EpicTyphlosion", - "Ether Egg", - "FΛDE", - "Forte", - "Fragmare", - "freq-mod", - "gtr3qq", - "Heemin", - "Hortus", - "ifrit05", - "iyatemu", - "JayBOB18", - "Jimmy-DS", - "Kagamiin~", - "Kaoru", - "kleeder", - "Korbo", - "jaezu", - "Laggy", - "leejh20", - "LovelyA72", - "LTVA", - "LunaMoth", - "LVintageNerd", - "Mahbod Karamoozian", - "masicbemester", - "MelonadeM", - "Miker", - "Molkirill", - "MrCoolDude", - "NeoWar", - "Nerreave", - "niffuM", - "Nikku4211", - "", - "Notakin", - "nwcr", - "NyaongI", - "Pale Moon", - "PeyPey", - "PichuMario", - "pixelated", - "Poltvick", - "PotaJoe", - "potatoTeto", - "psxdominator", - "Raijin", - "railzen7", - "Rancastor", - "Rei8bit", - "RepellantMold", - "RetroCarrot", - "RevvoBolt", - "Rockyfan75000", - "Roostersox", - "scooblee", - "sheffield^2", - "sillygoose", - "Slightly Large NC", - "smaybius", - "SnugglyBun", - "Someone64", - "Spinning Square Waves", - "src3453", - "SuperJet Spade", - "Supper_E1", - "SwapXFO", - "Swirly", - "System64", - "TakuikaNinja", - "tapekeep", - "TapeStone", - "TCORPStudios", - "Teuthida", - "ThaCuber", - "The Blender Fiddler", - "TheDuccinator", - "theloredev", - "The Beesh-Spweesh!", - "TheRealHedgehogSonic", - "tildearrow", - "tom_atom", - "traumatized", - "Tytanium654", - "Ultraprogramer", - "UserSniper", - "Weeppiko", - "Wegfrei", - "Xan", - "Yuzu4K", - "Zabir", - "Zaxolotl", - "ZoomTen (Zumi)", - "", _N("-- additional feedback/fixes --"), "Electric Keet", "fd",