Fix cmakelists

Author: johnBuffer

CMakeLists.txt

@@ -10,12 +10,10 @@ file(GLOB source_files
 set(SOURCES ${source_files})
 
 # Detect and add SFML
-set(SFML_STATIC_LIBRARIES TRUE)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules" ${CMAKE_MODULE_PATH})
 find_package(SFML 2 REQUIRED COMPONENTS network audio graphics window system)
 
 add_executable(${PROJECT_NAME} ${SOURCES})
-add_definitions(-DSFML_STATIC)
 target_include_directories(${PROJECT_NAME} PRIVATE "include" "lib")
 target_link_libraries(${PROJECT_NAME} sfml-system sfml-window sfml-graphics)
 if (UNIX)

src/display_manager.cpp

@@ -85,6 +85,7 @@ void DisplayManager::processEvents()
 		switch (event.type)
 		{
 		case sf::Event::KeyPressed:
+			if (event.type == sf::Event::Closed) m_window.close();
 			if (event.key.code == sf::Keyboard::Escape) m_window.close();
 			else if ((event.key.code == sf::Keyboard::Subtract)) zoom(0.8f);
 			else if ((event.key.code == sf::Keyboard::Add)) zoom(1.2f);

src/main.cpp

@@ -10,7 +10,7 @@ int main()
 {
 	sf::ContextSettings settings;
 	settings.antialiasingLevel = 8;
-	sf::RenderWindow window(sf::VideoMode(Conf<>::WIN_WIDTH, Conf<>::WIN_HEIGHT), "AntSim", sf::Style::Fullscreen, settings);
+	sf::RenderWindow window(sf::VideoMode(Conf<>::WIN_WIDTH, Conf<>::WIN_HEIGHT), "AntSim", sf::Style::Default, settings);
 	window.setFramerateLimit(60);
 
 	Conf<>::loadTextures();