Merge pull request #5 from r3w0p/1.0.1

1.0.1
r3w0p · May 28, 2024 · b6c1b4e · b6c1b4e
2 parents b49b632 + 280ecfd
commit b6c1b4e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,32 +1,26 @@
 cmake_minimum_required(VERSION 3.27)
 
-project(caravan C CXX)
+project(caravan LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(PROJECT_VERSION 1.0.0)
+set(PROJECT_VERSION 1.0.1)
 set(PROJECT_COPYRIGHT "Copyright (c) 2022-2024 r3w0p")
 set(PROJECT_DESCRIPTION "A command-line version of the Caravan card game from Fallout: New Vegas.")
 set(PROJECT_URL "https://github.com/r3w0p/caravan")
 
+IF (WIN32 OR WIN64)
 set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "-static")
+ENDIF ()
 
 include(FetchContent)
 set(FETCHCONTENT_UPDATES_DISCONNECTED TRUE)
 set(FETCHCONTENT_QUIET FALSE)
 
 
 # --- FTXUI
-IF (APPLE)
-    set(CMAKE_THREAD_LIBS_INIT "-lpthread")
-    set(CMAKE_HAVE_THREADS_LIBRARY 1)
-    set(CMAKE_USE_WIN32_THREADS_INIT 0)
-    set(CMAKE_USE_PTHREADS_INIT 1)
-    set(THREADS_PREFER_PTHREAD_FLAG ON)
-ENDIF ()
-
 FetchContent_Declare(ftxui
         GIT_REPOSITORY https://github.com/ArthurSonzogni/ftxui
         GIT_TAG v5.0.0

diff --git a/README b/README
@@ -3,7 +3,7 @@
 | (_| (_| | | | (_| |\ \/ / (_| | | | |
  \___\__,_|_|  \__,_| \__/ \__,_|_| |_|
 
-| v1.0.0 | GPL-3.0 | (c) 2022-2024 r3w0p |
+| v1.0.1 | GPL-3.0 | (c) 2022-2024 r3w0p |
 
 A command-line version of the Caravan card game from Fallout: New Vegas.
 

diff --git a/src/caravan/view/view_tui.cpp b/src/caravan/view/view_tui.cpp
@@ -725,7 +725,7 @@ std::shared_ptr<ftxui::Node> gen_terminal_too_small(
                     text("Width:  " + std::to_string(terminal_size.dimx) + " / " + std::to_string(MIN_X)),
                     text("Height: " + std::to_string(terminal_size.dimy) + " / " + std::to_string(MIN_Y)),
                     separatorEmpty(),
-                    text("Resize terminal or press Escape"),
+                    text("Resize terminal or press Esc"),
                 }) | center;
 }
 
@@ -737,7 +737,7 @@ std::shared_ptr<ftxui::Node> gen_closed(ViewConfig *vc) {
         e.push_back(text(vc->msg_fatal));
         e.push_back(separatorEmpty());
     }
-    e.push_back(text("Press Escape to leave."));
+    e.push_back(text("Press Esc to exit."));
 
     return vbox(e) | center;
 }