JCS-Prod/ProtoTank
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Mess up with dll on windows

Browse Source
This commit is contained in:
JackCarterSmith 2024-10-31 19:43:23 +01:00
parent c0a00e4e4a
commit aa871b8b76
Signed by: JackCarterSmith
GPG Key ID: 832E52F4E23F8F24
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -64,7 +64,7 @@ target_sources(${PROJECT_NAME} PRIVATE
# target_compile_options(${PROJECT_NAME} PRIVATE -pg -no-pie) # target_compile_options(${PROJECT_NAME} PRIVATE -pg -no-pie)
# target_link_options(${PROJECT_NAME} PRIVATE -pg -no-pie) # target_link_options(${PROJECT_NAME} PRIVATE -pg -no-pie)
#endif() #endif()
target_link_libraries(${PROJECT_NAME} sfml::sfml) target_link_libraries(${PROJECT_NAME} -static gcc stdc++ pthread -dynamic sfml::sfml)
set_target_properties(${PROJECT_NAME} PROPERTIES set_target_properties(${PROJECT_NAME} PROPERTIES
OUTPUT_NAME ${PROJECT_NAME}${BUILDNAME_SUFFIX} OUTPUT_NAME ${PROJECT_NAME}${BUILDNAME_SUFFIX}
CXX_STANDARD 17 CXX_STANDARD 17

27
ProtoTank.cpp
View File

@ -87,19 +87,22 @@ int main(int argc, char** argv) {
} }
} }
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Escape)) { // Focused-only keys actions
mainWindow->close(); if (mainWindow->hasFocus()) {
status = GAME_QUIT; if (sf::Keyboard::isKeyPressed(sf::Keyboard::Escape)) {
} else if ((sf::Keyboard::isKeyPressed(sf::Keyboard::LAlt) || sf::Keyboard::isKeyPressed(sf::Keyboard::RAlt)) && sf::Keyboard::isKeyPressed(sf::Keyboard::Enter)) { mainWindow->close();
wndParams.wndFullscreen = !wndParams.wndFullscreen; status = GAME_QUIT;
try { } else if ((sf::Keyboard::isKeyPressed(sf::Keyboard::LAlt) || sf::Keyboard::isKeyPressed(sf::Keyboard::RAlt)) && sf::Keyboard::isKeyPressed(sf::Keyboard::Enter)) {
CreateWindow(mainWindow, wndParams); wndParams.wndFullscreen = !wndParams.wndFullscreen;
} catch (const std::exception& ex) { try {
log.PrintCritical(std::string(ex.what())); CreateWindow(mainWindow, wndParams);
return EXIT_FAILURE; } catch (const std::exception& ex) {
} log.PrintCritical(std::string(ex.what()));
return EXIT_FAILURE;
}
arcadeGame.EventWindowSizeChanged(mainWindow->getSize().x, mainWindow->getSize().y); arcadeGame.EventWindowSizeChanged(mainWindow->getSize().x, mainWindow->getSize().y);
}
} }
status = arcadeGame.Tick(); status = arcadeGame.Tick();

2
conanfile.py
View File

@ -21,7 +21,7 @@ class ProtoTank(ConanFile):
def configure(self): def configure(self):
self.options["sfml"].audio = True self.options["sfml"].audio = False
self.options["sfml"].window = True self.options["sfml"].window = True
self.options["sfml"].network = False self.options["sfml"].network = False
self.options["sfml"].graphics = True self.options["sfml"].graphics = True