From b361d0fc6ba921ca0eaae4a534d342c4c151f316 Mon Sep 17 00:00:00 2001 From: dashodanger Date: Tue, 28 May 2024 13:23:05 -0600 Subject: [PATCH] Remove Haiku OS references --- CMakeLists.txt | 22 ++++------------------ COMPILING.md | 6 +----- README.md | 4 ++-- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 077fa9759..9008e4b61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12..3.20) add_subdirectory(source_files/ajbsp EXCLUDE_FROM_ALL) add_subdirectory(source_files/ajparse EXCLUDE_FROM_ALL) -if(NOT CONSOLE_ONLY AND NOT HAIKU) +if(NOT CONSOLE_ONLY) add_subdirectory(source_files/fltk EXCLUDE_FROM_ALL) endif() add_subdirectory(source_files/filename_formatter EXCLUDE_FROM_ALL) @@ -19,7 +19,7 @@ project( string(TIMESTAMP BUILD_TIMESTAMP "%Y.%m.%d" UTC) add_compile_definitions(OBSIDIAN_TIMESTAMP="${BUILD_TIMESTAMP}") -if(CONSOLE_ONLY OR HAIKU) +if(CONSOLE_ONLY) add_compile_definitions(CONSOLE_ONLY=1) endif() @@ -49,7 +49,7 @@ if(${CMAKE_SYSTEM} MATCHES "OpenBSD") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I /usr/X11R6/include") endif() -if(NOT CONSOLE_ONLY AND NOT HAIKU) +if(NOT CONSOLE_ONLY) add_executable( obsidian source_files/obsidian_main/aj_map.cc @@ -153,7 +153,7 @@ endif() target_include_directories(obsidian SYSTEM PRIVATE source_files/ajbsp) target_include_directories(obsidian SYSTEM PRIVATE source_files/ajparse) -if(NOT CONSOLE_ONLY AND NOT HAIKU) +if(NOT CONSOLE_ONLY) target_include_directories(obsidian SYSTEM PRIVATE source_files/fltk) target_include_directories( obsidian SYSTEM PRIVATE "${PROJECT_BINARY_DIR}/source_files/fltk" @@ -169,7 +169,6 @@ target_include_directories(obsidian SYSTEM PRIVATE source_files/slump) if(UNIX) if(NOT CONSOLE_ONLY - AND NOT HAIKU AND NOT APPLE ) find_package(Fontconfig REQUIRED) @@ -227,19 +226,6 @@ if(UNIX) obsidian_slump ) endif() - elseif(HAIKU) - target_link_libraries( - obsidian - PRIVATE ajbsp - ajparse - filename_formatter - miniz - physfs-static - obsidian_slump - pthread - be - root - ) else() if(NOT CONSOLE_ONLY) target_link_libraries( diff --git a/COMPILING.md b/COMPILING.md index 74665928a..a0cb4be9c 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -1,10 +1,6 @@ # COMPILING Obsidian -## Haiku OS Dependencies (Builds in console-only mode, tested with R1/Beta 3) -1. CMake - * HaikuDepot package: `cmake` - ## BSD Dependencies 1. CMake Utilities: * package: `cmake` @@ -38,7 +34,7 @@ The C++ compiler/toolchain should already be present on a typical BSD install * Wayland support for FLTK 1.4 is in a state of flux; instructions and dependencies can be found in the source_files/fltk/README.Wayland.txt file -## Linux/BSD/Haiku OS Compilation +## Linux/BSD Compilation Assuming all those dependencies are met, then the following steps will build the Obsidian binary. diff --git a/README.md b/README.md index 80b786ace..1b8c57c36 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,9 @@ Double click on the OBSIDIAN icon to run it. Select the game in the top left pa OBSIDIAN will then build all the maps, showing a blueprint of each one as it goes, and if everything goes smoothly the output file will be created at the end. Then you can play it using the normal method for playing mods with that game (e.g. for DOOM source ports: dragging-n-dropping the WAD file onto the source port's EXE is usually enough). -## QUICK START GUIDE (Linux/BSD/Haiku OS) +## QUICK START GUIDE (Linux/BSD) -Please refer to COMPILING.md to build Obsidian for Linux/BSD/Haiku OS +Please refer to COMPILING.md to build Obsidian for Linux/BSD ## About This Repository