2 Commits

Author SHA1 Message Date
db972f8635 CMakeLists fix for Mac on Apple Silicon processors 2025-02-08 12:26:36 +01:00
817b94321b to do done 2025-01-18 01:02:52 +01:00
2 changed files with 8 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.25) cmake_minimum_required(VERSION 3.25)
project(LotoStatek) project(LotoStatek)
include(FetchContent)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
add_executable(LotoStatek main.cpp add_executable(LotoStatek main.cpp
@@ -63,9 +63,12 @@ if(WIN32)
target_link_libraries(LotoStatek ${SFML_LIBRARIES}) target_link_libraries(LotoStatek ${SFML_LIBRARIES})
endif() endif()
elseif(APPLE) elseif(APPLE)
find_package(SFML 2.6.2 COMPONENTS graphics window system REQUIRED) set(BUILD_SHARED_LIBS OFF)
target_link_libraries(LotoStatek sfml-graphics sfml-window sfml-audio sfml-system) FetchContent_Declare(
elseif(LINUX) SFML
find_package(SFML 2.6.2 COMPONENTS graphics window system REQUIRED) GIT_REPOSITORY https://github.com/SFML/SFML.git
GIT_TAG 2.6.2
)
FetchContent_MakeAvailable(SFML)
target_link_libraries(LotoStatek sfml-graphics sfml-window sfml-audio sfml-system) target_link_libraries(LotoStatek sfml-graphics sfml-window sfml-audio sfml-system)
endif() endif()

View File

@@ -217,7 +217,6 @@ void Plansza::update() {
check_Debuff_collisions(); check_Debuff_collisions();
// TODO: Dodać flagę aby warunek był sprawdzany nie tylko pod kątem Timeru ale również pod kątem ustawionej flagi
if (movingSpeedPUTimer.getElapsedTime().asSeconds() >= 5.0f && powerUpCollected.movingSpeed) { if (movingSpeedPUTimer.getElapsedTime().asSeconds() >= 5.0f && powerUpCollected.movingSpeed) {
powerUpCollected.movingSpeed = false; powerUpCollected.movingSpeed = false;
ship->setMovingSpeed(8.0f); ship->setMovingSpeed(8.0f);