Merge remote-tracking branch 'refs/remotes/origin/przeszkoda'
# Conflicts: # CMakeLists.txt # main.cpp
This commit is contained in:
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user