diff options
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | build/.ninja_deps | bin | 0 -> 8204 bytes | |||
| -rw-r--r-- | build/.ninja_log | 4 | ||||
| -rw-r--r-- | build/CMakeFiles/TargetDirectories.txt | 6 | ||||
| -rw-r--r-- | build/CMakeFiles/minesweeper.dir/src/Game/display.cpp.obj | bin | 0 -> 2064 bytes | |||
| -rw-r--r-- | build/CMakeFiles/minesweeper.dir/src/Game/init.cpp.obj | bin | 0 -> 2024 bytes | |||
| -rw-r--r-- | build/CMakeFiles/minesweeper.dir/src/main.cpp.obj | bin | 0 -> 2265 bytes | |||
| -rw-r--r-- | build/CMakeFiles/rules.ninja | 64 | ||||
| -rw-r--r-- | build/build.ninja | 164 | ||||
| -rw-r--r-- | build/cmake_install.cmake | 23 | ||||
| -rw-r--r-- | src/.Game.cpp.swp | bin | 0 -> 12288 bytes | |||
| -rw-r--r-- | src/Game.cpp | 4 |
12 files changed, 272 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ad2fca5..495420d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,13 @@ cmake_minimum_required(VERSION 3.13) +<<<<<<< HEAD +set(SOURCE_FILES +src/main.cpp +src/Game/edit.cpp +src/Game/display.cpp +src/Game/init.cpp +src/Utils/catch.cpp +======= project(minesweeper LANGUAGES CXX) set(CMAKE_CXX_STANDARD 20) @@ -8,6 +16,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp" +>>>>>>> e6a7c80d3261e8b0c3e73294c0dace4d36158c5d ) add_executable(minesweeper) diff --git a/build/.ninja_deps b/build/.ninja_deps Binary files differnew file mode 100644 index 0000000..d92f47b --- /dev/null +++ b/build/.ninja_deps diff --git a/build/.ninja_log b/build/.ninja_log new file mode 100644 index 0000000..f7c44e9 --- /dev/null +++ b/build/.ninja_log @@ -0,0 +1,4 @@ +# ninja log v6 +18 1606 7913148321555359 CMakeFiles/minesweeper.dir/src/Game/init.cpp.obj 417edab851bcf91c +1 1613 7913148321285368 CMakeFiles/minesweeper.dir/src/main.cpp.obj f5efa4a7209938f4 +12 1616 7913148321495149 CMakeFiles/minesweeper.dir/src/Game/display.cpp.obj c176474163789830 diff --git a/build/CMakeFiles/TargetDirectories.txt b/build/CMakeFiles/TargetDirectories.txt index f7cf61e..959b443 100644 --- a/build/CMakeFiles/TargetDirectories.txt +++ b/build/CMakeFiles/TargetDirectories.txt @@ -1,4 +1,10 @@ +<<<<<<< HEAD +D:/code/minesweeper/build/CMakeFiles/minesweeper.dir +D:/code/minesweeper/build/CMakeFiles/edit_cache.dir +D:/code/minesweeper/build/CMakeFiles/rebuild_cache.dir +======= /home/dawidg81/minesweeper/build/CMakeFiles/minesweeper.dir /home/dawidg81/minesweeper/build/CMakeFiles/test.dir /home/dawidg81/minesweeper/build/CMakeFiles/edit_cache.dir /home/dawidg81/minesweeper/build/CMakeFiles/rebuild_cache.dir +>>>>>>> e6a7c80d3261e8b0c3e73294c0dace4d36158c5d diff --git a/build/CMakeFiles/minesweeper.dir/src/Game/display.cpp.obj b/build/CMakeFiles/minesweeper.dir/src/Game/display.cpp.obj Binary files differnew file mode 100644 index 0000000..d1297c1 --- /dev/null +++ b/build/CMakeFiles/minesweeper.dir/src/Game/display.cpp.obj diff --git a/build/CMakeFiles/minesweeper.dir/src/Game/init.cpp.obj b/build/CMakeFiles/minesweeper.dir/src/Game/init.cpp.obj Binary files differnew file mode 100644 index 0000000..7c31aa1 --- /dev/null +++ b/build/CMakeFiles/minesweeper.dir/src/Game/init.cpp.obj diff --git a/build/CMakeFiles/minesweeper.dir/src/main.cpp.obj b/build/CMakeFiles/minesweeper.dir/src/main.cpp.obj Binary files differnew file mode 100644 index 0000000..994f23f --- /dev/null +++ b/build/CMakeFiles/minesweeper.dir/src/main.cpp.obj diff --git a/build/CMakeFiles/rules.ninja b/build/CMakeFiles/rules.ninja new file mode 100644 index 0000000..0408dd1 --- /dev/null +++ b/build/CMakeFiles/rules.ninja @@ -0,0 +1,64 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Ninja" Generator, CMake Version 3.29 + +# This file contains all the rules used to get the outputs files +# built from the input files. +# It is included in the main 'build.ninja'. + +# ============================================================================= +# Project: minesweeper +# Configurations: +# ============================================================================= +# ============================================================================= + +############################################# +# Rule for compiling CXX files. + +rule CXX_COMPILER__minesweeper_unscanned_ + depfile = $DEP_FILE + deps = gcc + command = ${LAUNCHER}${CODE_CHECK}D:\MinGW\bin\c++.exe $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $in + description = Building CXX object $out + + +############################################# +# Rule for linking CXX executable. + +rule CXX_EXECUTABLE_LINKER__minesweeper_ + command = C:\WINDOWS\system32\cmd.exe /C "$PRE_LINK && D:\MinGW\bin\c++.exe $FLAGS $LINK_FLAGS $in -o $TARGET_FILE -Wl,--out-implib,$TARGET_IMPLIB -Wl,--major-image-version,0,--minor-image-version,0 $LINK_PATH $LINK_LIBRARIES && $POST_BUILD" + description = Linking CXX executable $TARGET_FILE + restat = $RESTAT + + +############################################# +# Rule for running custom commands. + +rule CUSTOM_COMMAND + command = $COMMAND + description = $DESC + + +############################################# +# Rule for re-running cmake. + +rule RERUN_CMAKE + command = D:\perl\c\bin\cmake.exe --regenerate-during-build -SD:\code\minesweeper -BD:\code\minesweeper\build + description = Re-running CMake... + generator = 1 + + +############################################# +# Rule for cleaning all built files. + +rule CLEAN + command = D:\perl\c\bin\ninja.exe $FILE_ARG -t clean $TARGETS + description = Cleaning all built files... + + +############################################# +# Rule for printing all primary targets available. + +rule HELP + command = D:\perl\c\bin\ninja.exe -t targets + description = All primary targets available: + diff --git a/build/build.ninja b/build/build.ninja new file mode 100644 index 0000000..e7e0502 --- /dev/null +++ b/build/build.ninja @@ -0,0 +1,164 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Ninja" Generator, CMake Version 3.29 + +# This file contains all the build statements describing the +# compilation DAG. + +# ============================================================================= +# Write statements declared in CMakeLists.txt: +# +# Which is the root file. +# ============================================================================= + +# ============================================================================= +# Project: minesweeper +# Configurations: +# ============================================================================= + +############################################# +# Minimal version of Ninja required by this file + +ninja_required_version = 1.5 + +# ============================================================================= +# Include auxiliary files. + + +############################################# +# Include rules file. + +include CMakeFiles/rules.ninja + +# ============================================================================= + +############################################# +# Logical path to working directory; prefix for absolute paths. + +cmake_ninja_workdir = D$:/code/minesweeper/build/ +# ============================================================================= +# Object build statements for EXECUTABLE target minesweeper + + +############################################# +# Order-only phony target for minesweeper + +build cmake_object_order_depends_target_minesweeper: phony || . + +build CMakeFiles/minesweeper.dir/src/main.cpp.obj: CXX_COMPILER__minesweeper_unscanned_ D$:/code/minesweeper/src/main.cpp || cmake_object_order_depends_target_minesweeper + DEP_FILE = CMakeFiles\minesweeper.dir\src\main.cpp.obj.d + FLAGS = -std=gnu++1z + OBJECT_DIR = CMakeFiles\minesweeper.dir + OBJECT_FILE_DIR = CMakeFiles\minesweeper.dir\src + +build CMakeFiles/minesweeper.dir/src/Game/edit.cpp.obj: CXX_COMPILER__minesweeper_unscanned_ D$:/code/minesweeper/src/Game/edit.cpp || cmake_object_order_depends_target_minesweeper + DEP_FILE = CMakeFiles\minesweeper.dir\src\Game\edit.cpp.obj.d + FLAGS = -std=gnu++1z + OBJECT_DIR = CMakeFiles\minesweeper.dir + OBJECT_FILE_DIR = CMakeFiles\minesweeper.dir\src\Game + +build CMakeFiles/minesweeper.dir/src/Game/display.cpp.obj: CXX_COMPILER__minesweeper_unscanned_ D$:/code/minesweeper/src/Game/display.cpp || cmake_object_order_depends_target_minesweeper + DEP_FILE = CMakeFiles\minesweeper.dir\src\Game\display.cpp.obj.d + FLAGS = -std=gnu++1z + OBJECT_DIR = CMakeFiles\minesweeper.dir + OBJECT_FILE_DIR = CMakeFiles\minesweeper.dir\src\Game + +build CMakeFiles/minesweeper.dir/src/Game/init.cpp.obj: CXX_COMPILER__minesweeper_unscanned_ D$:/code/minesweeper/src/Game/init.cpp || cmake_object_order_depends_target_minesweeper + DEP_FILE = CMakeFiles\minesweeper.dir\src\Game\init.cpp.obj.d + FLAGS = -std=gnu++1z + OBJECT_DIR = CMakeFiles\minesweeper.dir + OBJECT_FILE_DIR = CMakeFiles\minesweeper.dir\src\Game + +build CMakeFiles/minesweeper.dir/src/Utils/catch.cpp.obj: CXX_COMPILER__minesweeper_unscanned_ D$:/code/minesweeper/src/Utils/catch.cpp || cmake_object_order_depends_target_minesweeper + DEP_FILE = CMakeFiles\minesweeper.dir\src\Utils\catch.cpp.obj.d + FLAGS = -std=gnu++1z + OBJECT_DIR = CMakeFiles\minesweeper.dir + OBJECT_FILE_DIR = CMakeFiles\minesweeper.dir\src\Utils + + +# ============================================================================= +# Link build statements for EXECUTABLE target minesweeper + + +############################################# +# Link the executable minesweeper.exe + +build minesweeper.exe: CXX_EXECUTABLE_LINKER__minesweeper_ CMakeFiles/minesweeper.dir/src/main.cpp.obj CMakeFiles/minesweeper.dir/src/Game/edit.cpp.obj CMakeFiles/minesweeper.dir/src/Game/display.cpp.obj CMakeFiles/minesweeper.dir/src/Game/init.cpp.obj CMakeFiles/minesweeper.dir/src/Utils/catch.cpp.obj + LINK_LIBRARIES = -lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 + OBJECT_DIR = CMakeFiles\minesweeper.dir + POST_BUILD = cd . + PRE_LINK = cd . + TARGET_FILE = minesweeper.exe + TARGET_IMPLIB = libminesweeper.dll.a + TARGET_PDB = minesweeper.exe.dbg + + +############################################# +# Utility command for edit_cache + +build CMakeFiles/edit_cache.util: CUSTOM_COMMAND + COMMAND = C:\WINDOWS\system32\cmd.exe /C "cd /D D:\code\minesweeper\build && D:\perl\c\bin\cmake.exe -E echo "No interactive CMake dialog available."" + DESC = No interactive CMake dialog available... + restat = 1 + +build edit_cache: phony CMakeFiles/edit_cache.util + + +############################################# +# Utility command for rebuild_cache + +build CMakeFiles/rebuild_cache.util: CUSTOM_COMMAND + COMMAND = C:\WINDOWS\system32\cmd.exe /C "cd /D D:\code\minesweeper\build && D:\perl\c\bin\cmake.exe --regenerate-during-build -SD:\code\minesweeper -BD:\code\minesweeper\build" + DESC = Running CMake to regenerate build system... + pool = console + restat = 1 + +build rebuild_cache: phony CMakeFiles/rebuild_cache.util + +# ============================================================================= +# Target aliases. + +build minesweeper: phony minesweeper.exe + +# ============================================================================= +# Folder targets. + +# ============================================================================= + +############################################# +# Folder: D:/code/minesweeper/build + +build all: phony minesweeper.exe + +# ============================================================================= +# Built-in targets + + +############################################# +# Re-run CMake if any of its inputs changed. + +build build.ninja: RERUN_CMAKE | CMakeCache.txt CMakeFiles/3.29.2/CMakeCCompiler.cmake CMakeFiles/3.29.2/CMakeCXXCompiler.cmake CMakeFiles/3.29.2/CMakeRCCompiler.cmake CMakeFiles/3.29.2/CMakeSystem.cmake D$:/code/minesweeper/CMakeLists.txt D$:/perl/c/share/cmake-3.29/Modules/CMakeCInformation.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeCXXInformation.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeCommonLanguageInclude.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeGenericSystem.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeInitializeConfigs.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeLanguageInformation.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeRCInformation.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeSystemSpecificInformation.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeSystemSpecificInitialize.cmake D$:/perl/c/share/cmake-3.29/Modules/Compiler/CMakeCommonCompilerMacros.cmake D$:/perl/c/share/cmake-3.29/Modules/Compiler/GNU-C.cmake D$:/perl/c/share/cmake-3.29/Modules/Compiler/GNU-CXX.cmake D$:/perl/c/share/cmake-3.29/Modules/Compiler/GNU.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-GNU-C-ABI.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-GNU-C.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-GNU-CXX-ABI.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-GNU-CXX.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-GNU.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-Initialize.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-windres.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/WindowsPaths.cmake + pool = console + + +############################################# +# A missing CMake input file is not an error. + +build CMakeCache.txt CMakeFiles/3.29.2/CMakeCCompiler.cmake CMakeFiles/3.29.2/CMakeCXXCompiler.cmake CMakeFiles/3.29.2/CMakeRCCompiler.cmake CMakeFiles/3.29.2/CMakeSystem.cmake D$:/code/minesweeper/CMakeLists.txt D$:/perl/c/share/cmake-3.29/Modules/CMakeCInformation.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeCXXInformation.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeCommonLanguageInclude.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeGenericSystem.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeInitializeConfigs.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeLanguageInformation.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeRCInformation.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeSystemSpecificInformation.cmake D$:/perl/c/share/cmake-3.29/Modules/CMakeSystemSpecificInitialize.cmake D$:/perl/c/share/cmake-3.29/Modules/Compiler/CMakeCommonCompilerMacros.cmake D$:/perl/c/share/cmake-3.29/Modules/Compiler/GNU-C.cmake D$:/perl/c/share/cmake-3.29/Modules/Compiler/GNU-CXX.cmake D$:/perl/c/share/cmake-3.29/Modules/Compiler/GNU.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-GNU-C-ABI.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-GNU-C.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-GNU-CXX-ABI.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-GNU-CXX.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-GNU.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-Initialize.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows-windres.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/Windows.cmake D$:/perl/c/share/cmake-3.29/Modules/Platform/WindowsPaths.cmake: phony + + +############################################# +# Clean all the built files. + +build clean: CLEAN + + +############################################# +# Print all primary targets available. + +build help: HELP + + +############################################# +# Make the all target the default. + +default all diff --git a/build/cmake_install.cmake b/build/cmake_install.cmake index 0d0f57c..b8dac64 100644 --- a/build/cmake_install.cmake +++ b/build/cmake_install.cmake @@ -1,8 +1,16 @@ +<<<<<<< HEAD +# Install script for directory: D:/code/minesweeper + +# Set the install prefix +if(NOT DEFINED CMAKE_INSTALL_PREFIX) + set(CMAKE_INSTALL_PREFIX "C:/Program Files (x86)/minesweeper") +======= # Install script for directory: /home/dawidg81/minesweeper # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) set(CMAKE_INSTALL_PREFIX "/usr/local") +>>>>>>> e6a7c80d3261e8b0c3e73294c0dace4d36158c5d endif() string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") @@ -12,7 +20,11 @@ if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") else() +<<<<<<< HEAD + set(CMAKE_INSTALL_CONFIG_NAME "") +======= set(CMAKE_INSTALL_CONFIG_NAME "Debug") +>>>>>>> e6a7c80d3261e8b0c3e73294c0dace4d36158c5d endif() message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") endif() @@ -27,11 +39,14 @@ if(NOT CMAKE_INSTALL_COMPONENT) endif() endif() +<<<<<<< HEAD +======= # Install shared libraries without execute permission? if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) set(CMAKE_INSTALL_SO_NO_EXE "1") endif() +>>>>>>> e6a7c80d3261e8b0c3e73294c0dace4d36158c5d # Is this installation the result of a crosscompile? if(NOT DEFINED CMAKE_CROSSCOMPILING) set(CMAKE_CROSSCOMPILING "FALSE") @@ -39,7 +54,11 @@ endif() # Set default install directory permissions. if(NOT DEFINED CMAKE_OBJDUMP) +<<<<<<< HEAD + set(CMAKE_OBJDUMP "D:/MinGW/bin/objdump.exe") +======= set(CMAKE_OBJDUMP "/usr/bin/objdump") +>>>>>>> e6a7c80d3261e8b0c3e73294c0dace4d36158c5d endif() if(CMAKE_INSTALL_COMPONENT) @@ -50,5 +69,9 @@ endif() string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT "${CMAKE_INSTALL_MANIFEST_FILES}") +<<<<<<< HEAD +file(WRITE "D:/code/minesweeper/build/${CMAKE_INSTALL_MANIFEST}" +======= file(WRITE "/home/dawidg81/minesweeper/build/${CMAKE_INSTALL_MANIFEST}" +>>>>>>> e6a7c80d3261e8b0c3e73294c0dace4d36158c5d "${CMAKE_INSTALL_MANIFEST_CONTENT}") diff --git a/src/.Game.cpp.swp b/src/.Game.cpp.swp Binary files differnew file mode 100644 index 0000000..1e31022 --- /dev/null +++ b/src/.Game.cpp.swp diff --git a/src/Game.cpp b/src/Game.cpp index 7f925fa..1ed4b50 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -80,7 +80,7 @@ int Game::editDiff(){ std::cin >> mines; if (mines > 8 || mines > (boardWidth * boardHeight)) { - std::cout << "There can't be more than " << mines << "mines." << std::endl; + std::cout << "There can't be more than " << mines << " mines." << std::endl; return 1; } @@ -128,4 +128,4 @@ void Game::displayBoard() { } putchar('\n'); } -}
\ No newline at end of file +} |