Skip to content

Commit

Permalink
Remove Haiku OS references
Browse files Browse the repository at this point in the history
  • Loading branch information
dashodanger committed May 28, 2024
1 parent 1709134 commit b361d0f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 25 deletions.
22 changes: 4 additions & 18 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand 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()

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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)
Expand Down Expand Up @@ -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(
Expand Down
6 changes: 1 addition & 5 deletions COMPILING.md
Original file line number Diff line number Diff line change
@@ -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`
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit b361d0f

Please sign in to comment.