Merge remote-tracking branch 'refs/remotes/origin/przeszkoda'

# Conflicts:
#	CMakeLists.txt
#	main.cpp
This commit is contained in:
2024-11-22 12:28:57 +01:00
18 changed files with 270 additions and 52 deletions

View File

@@ -16,7 +16,10 @@ add_executable(LotoStatek main.cpp
sources/Background.cpp
headers/AudioManager.h
sources/AudioManager.cpp
)
sources/Bullet.cpp
headers/Meteor.h
sources/Meteor.cpp
headers/RandomNumberGenerator.h)
if(WIN32)
set(SFML_ROOT "${CMAKE_SOURCE_DIR}/SFML")