diff --git a/CMakeLists.txt b/CMakeLists.txt index c9435dc..a1bc7bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ add_executable(${EXECUTABLE_NAME} ${BACKWARD_ENABLE} ) -add_backward(mapgen) +#add_backward(mapgen) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) diff --git a/backward-cpp/cmake_install.cmake b/backward-cpp/cmake_install.cmake index d160f02..a5bcb62 100644 --- a/backward-cpp/cmake_install.cmake +++ b/backward-cpp/cmake_install.cmake @@ -1,8 +1,8 @@ -# Install script for directory: /home/alexeynabrodov/projects/mapgen/backward-cpp +# Install script for directory: C:/Users/averr_000/Documents/GitHub/mapgen/backward-cpp # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) - set(CMAKE_INSTALL_PREFIX "/usr/local") + set(CMAKE_INSTALL_PREFIX "C:/Program Files (x86)/mapgen") endif() string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") @@ -12,7 +12,7 @@ if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") else() - set(CMAKE_INSTALL_CONFIG_NAME "Debug") + set(CMAKE_INSTALL_CONFIG_NAME "Release") endif() message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") endif() @@ -27,32 +27,27 @@ if(NOT CMAKE_INSTALL_COMPONENT) endif() endif() -# Install shared libraries without execute permission? -if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - set(CMAKE_INSTALL_SO_NO_EXE "1") -endif() - -if(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") +if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT) list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES - "/usr/local/include/backward.hpp") + "C:/Program Files (x86)/mapgen/include/backward.hpp") if(CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) message(WARNING "ABSOLUTE path INSTALL DESTINATION : ${CMAKE_ABSOLUTE_DESTINATION_FILES}") endif() if(CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) message(FATAL_ERROR "ABSOLUTE path INSTALL DESTINATION forbidden (by caller): ${CMAKE_ABSOLUTE_DESTINATION_FILES}") endif() -file(INSTALL DESTINATION "/usr/local/include" TYPE FILE FILES "/home/alexeynabrodov/projects/mapgen/backward-cpp/backward.hpp") +file(INSTALL DESTINATION "C:/Program Files (x86)/mapgen/include" TYPE FILE FILES "C:/Users/averr_000/Documents/GitHub/mapgen/backward-cpp/backward.hpp") endif() -if(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") +if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT) list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES - "/usr/local/lib/backward/BackwardConfig.cmake") + "C:/Program Files (x86)/mapgen/lib/backward/BackwardConfig.cmake") if(CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) message(WARNING "ABSOLUTE path INSTALL DESTINATION : ${CMAKE_ABSOLUTE_DESTINATION_FILES}") endif() if(CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) message(FATAL_ERROR "ABSOLUTE path INSTALL DESTINATION forbidden (by caller): ${CMAKE_ABSOLUTE_DESTINATION_FILES}") endif() -file(INSTALL DESTINATION "/usr/local/lib/backward" TYPE FILE FILES "/home/alexeynabrodov/projects/mapgen/backward-cpp/BackwardConfig.cmake") +file(INSTALL DESTINATION "C:/Program Files (x86)/mapgen/lib/backward" TYPE FILE FILES "C:/Users/averr_000/Documents/GitHub/mapgen/backward-cpp/BackwardConfig.cmake") endif() diff --git a/cmake/modules/FindSFML.cmake b/cmake/modules/FindSFML.cmake index fe84c96..d658460 100644 --- a/cmake/modules/FindSFML.cmake +++ b/cmake/modules/FindSFML.cmake @@ -64,7 +64,7 @@ endif() set(FIND_SFML_PATHS ${SFML_ROOT} $ENV{SFML_ROOT} - ~/Library/Frameworks + E:\\SFML-2.4.2 /Library/Frameworks /usr/local /usr diff --git a/include/mapgen/MapGenerator.hpp b/include/mapgen/MapGenerator.hpp index cdeb451..2dc192e 100644 --- a/include/mapgen/MapGenerator.hpp +++ b/include/mapgen/MapGenerator.hpp @@ -3,8 +3,9 @@ #include #include -#include +#include #include "noise/noiseutils.h" +#include #include //TODO: fix it and use header diff --git a/include/noise/noiseutils.h b/include/noise/noiseutils.h index a537fbe..8b02403 100644 --- a/include/noise/noiseutils.h +++ b/include/noise/noiseutils.h @@ -27,7 +27,7 @@ #include #include -#include +#include using namespace noise; diff --git a/src/application.cpp b/src/application.cpp index 803b686..bc23707 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -49,7 +49,7 @@ class Application { bool hum = false; bool simplifyRivers; int t = 0; - float color[3] = {0.12, 0.12, 0.12}; + float color[3] = {0.12f, 0.12f, 0.12f}; bool showUI = true; bool getScreenshot = false; float temperature; @@ -66,7 +66,7 @@ class Application { ImGuiIO &io = ImGui::GetIO(); io.Fonts->AddFontFromFileTTF("./font.ttf", 15.0f); - window = new sf::RenderWindow(sf::VideoMode::getDesktopMode(), "", + window = new sf::RenderWindow(sf::VideoMode(1026,768), "", sf::Style::Default, settings); window->setVerticalSyncEnabled(true); ImGui::SFML::Init(*window); diff --git a/src/noiseutils.cpp b/src/noiseutils.cpp index e94b849..dced2bd 100644 --- a/src/noiseutils.cpp +++ b/src/noiseutils.cpp @@ -22,8 +22,8 @@ #include -#include -#include +#include +#include #include "noise/noiseutils.h"