diff --git a/.gitignore b/.gitignore index 3e759b7..207304b 100644 --- a/.gitignore +++ b/.gitignore @@ -328,3 +328,6 @@ ASALocalRun/ # MFractors (Xamarin productivity tool) working folder .mfractor/ + +# Ignore all the files generated by CMake +CMakeFiles/ \ No newline at end of file diff --git a/CMakeCache.txt b/CMakeCache.txt index 23c50b6..2b00bb4 100644 --- a/CMakeCache.txt +++ b/CMakeCache.txt @@ -261,7 +261,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_NM CMAKE_NM-ADVANCED:INTERNAL=1 //number of local generators -CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=3 +CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=2 //ADVANCED property for variable: CMAKE_OBJCOPY CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_OBJDUMP diff --git a/CMakeFiles/Makefile.cmake b/CMakeFiles/Makefile.cmake index ace2a9b..c87d687 100644 --- a/CMakeFiles/Makefile.cmake +++ b/CMakeFiles/Makefile.cmake @@ -10,8 +10,7 @@ set(CMAKE_MAKEFILE_DEPENDS "CMakeFiles/3.10.2/CMakeCXXCompiler.cmake" "CMakeFiles/3.10.2/CMakeSystem.cmake" "CMakeLists.txt" - "classes/Game/CMakeLists.txt" - "classes/GameWindow/CMakeLists.txt" + "src/CMakeLists.txt" "/usr/share/cmake-3.10/Modules/CMakeCXXInformation.cmake" "/usr/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake" "/usr/share/cmake-3.10/Modules/CMakeGenericSystem.cmake" @@ -40,13 +39,12 @@ set(CMAKE_MAKEFILE_OUTPUTS # Byproducts of CMake generate step: set(CMAKE_MAKEFILE_PRODUCTS "CMakeFiles/CMakeDirectoryInformation.cmake" - "classes/Game/CMakeFiles/CMakeDirectoryInformation.cmake" - "classes/GameWindow/CMakeFiles/CMakeDirectoryInformation.cmake" + "src/CMakeFiles/CMakeDirectoryInformation.cmake" ) # Dependency information for all targets: set(CMAKE_DEPEND_INFO_FILES "CMakeFiles/main.dir/DependInfo.cmake" - "classes/Game/CMakeFiles/game.dir/DependInfo.cmake" - "classes/GameWindow/CMakeFiles/window.dir/DependInfo.cmake" + "src/CMakeFiles/game.dir/DependInfo.cmake" + "src/CMakeFiles/window.dir/DependInfo.cmake" ) diff --git a/CMakeFiles/Makefile2 b/CMakeFiles/Makefile2 index b3bdc9a..dde77c0 100644 --- a/CMakeFiles/Makefile2 +++ b/CMakeFiles/Makefile2 @@ -63,8 +63,8 @@ CMAKE_BINARY_DIR = /home/codio/workspace/Text-Based-Game # Target rules for target CMakeFiles/main.dir # All Build rule for target. -CMakeFiles/main.dir/all: classes/Game/CMakeFiles/game.dir/all -CMakeFiles/main.dir/all: classes/GameWindow/CMakeFiles/window.dir/all +CMakeFiles/main.dir/all: src/CMakeFiles/game.dir/all +CMakeFiles/main.dir/all: src/CMakeFiles/window.dir/all $(MAKE) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/depend $(MAKE) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/build @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/codio/workspace/Text-Based-Game/CMakeFiles --progress-num=3,4 "Built target main" @@ -98,112 +98,96 @@ clean: CMakeFiles/main.dir/clean .PHONY : clean #============================================================================= -# Directory level rules for directory classes/Game +# Directory level rules for directory src # Convenience name for "all" pass in the directory. -classes/Game/all: classes/Game/CMakeFiles/game.dir/all +src/all: src/CMakeFiles/game.dir/all +src/all: src/CMakeFiles/window.dir/all -.PHONY : classes/Game/all +.PHONY : src/all # Convenience name for "clean" pass in the directory. -classes/Game/clean: classes/Game/CMakeFiles/game.dir/clean +src/clean: src/CMakeFiles/game.dir/clean +src/clean: src/CMakeFiles/window.dir/clean -.PHONY : classes/Game/clean +.PHONY : src/clean # Convenience name for "preinstall" pass in the directory. -classes/Game/preinstall: +src/preinstall: -.PHONY : classes/Game/preinstall +.PHONY : src/preinstall #============================================================================= -# Target rules for target classes/Game/CMakeFiles/game.dir +# Target rules for target src/CMakeFiles/game.dir # All Build rule for target. -classes/Game/CMakeFiles/game.dir/all: - $(MAKE) -f classes/Game/CMakeFiles/game.dir/build.make classes/Game/CMakeFiles/game.dir/depend - $(MAKE) -f classes/Game/CMakeFiles/game.dir/build.make classes/Game/CMakeFiles/game.dir/build +src/CMakeFiles/game.dir/all: + $(MAKE) -f src/CMakeFiles/game.dir/build.make src/CMakeFiles/game.dir/depend + $(MAKE) -f src/CMakeFiles/game.dir/build.make src/CMakeFiles/game.dir/build @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/codio/workspace/Text-Based-Game/CMakeFiles --progress-num=1,2 "Built target game" -.PHONY : classes/Game/CMakeFiles/game.dir/all +.PHONY : src/CMakeFiles/game.dir/all # Include target in all. -all: classes/Game/CMakeFiles/game.dir/all +all: src/CMakeFiles/game.dir/all .PHONY : all # Build rule for subdir invocation for target. -classes/Game/CMakeFiles/game.dir/rule: cmake_check_build_system +src/CMakeFiles/game.dir/rule: cmake_check_build_system $(CMAKE_COMMAND) -E cmake_progress_start /home/codio/workspace/Text-Based-Game/CMakeFiles 2 - $(MAKE) -f CMakeFiles/Makefile2 classes/Game/CMakeFiles/game.dir/all + $(MAKE) -f CMakeFiles/Makefile2 src/CMakeFiles/game.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/codio/workspace/Text-Based-Game/CMakeFiles 0 -.PHONY : classes/Game/CMakeFiles/game.dir/rule +.PHONY : src/CMakeFiles/game.dir/rule # Convenience name for target. -game: classes/Game/CMakeFiles/game.dir/rule +game: src/CMakeFiles/game.dir/rule .PHONY : game # clean rule for target. -classes/Game/CMakeFiles/game.dir/clean: - $(MAKE) -f classes/Game/CMakeFiles/game.dir/build.make classes/Game/CMakeFiles/game.dir/clean -.PHONY : classes/Game/CMakeFiles/game.dir/clean +src/CMakeFiles/game.dir/clean: + $(MAKE) -f src/CMakeFiles/game.dir/build.make src/CMakeFiles/game.dir/clean +.PHONY : src/CMakeFiles/game.dir/clean # clean rule for target. -clean: classes/Game/CMakeFiles/game.dir/clean +clean: src/CMakeFiles/game.dir/clean .PHONY : clean #============================================================================= -# Directory level rules for directory classes/GameWindow - -# Convenience name for "all" pass in the directory. -classes/GameWindow/all: classes/GameWindow/CMakeFiles/window.dir/all - -.PHONY : classes/GameWindow/all - -# Convenience name for "clean" pass in the directory. -classes/GameWindow/clean: classes/GameWindow/CMakeFiles/window.dir/clean - -.PHONY : classes/GameWindow/clean - -# Convenience name for "preinstall" pass in the directory. -classes/GameWindow/preinstall: - -.PHONY : classes/GameWindow/preinstall - -#============================================================================= -# Target rules for target classes/GameWindow/CMakeFiles/window.dir +# Target rules for target src/CMakeFiles/window.dir # All Build rule for target. -classes/GameWindow/CMakeFiles/window.dir/all: - $(MAKE) -f classes/GameWindow/CMakeFiles/window.dir/build.make classes/GameWindow/CMakeFiles/window.dir/depend - $(MAKE) -f classes/GameWindow/CMakeFiles/window.dir/build.make classes/GameWindow/CMakeFiles/window.dir/build +src/CMakeFiles/window.dir/all: + $(MAKE) -f src/CMakeFiles/window.dir/build.make src/CMakeFiles/window.dir/depend + $(MAKE) -f src/CMakeFiles/window.dir/build.make src/CMakeFiles/window.dir/build @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/codio/workspace/Text-Based-Game/CMakeFiles --progress-num=5,6 "Built target window" -.PHONY : classes/GameWindow/CMakeFiles/window.dir/all +.PHONY : src/CMakeFiles/window.dir/all # Include target in all. -all: classes/GameWindow/CMakeFiles/window.dir/all +all: src/CMakeFiles/window.dir/all .PHONY : all # Build rule for subdir invocation for target. -classes/GameWindow/CMakeFiles/window.dir/rule: cmake_check_build_system +src/CMakeFiles/window.dir/rule: cmake_check_build_system $(CMAKE_COMMAND) -E cmake_progress_start /home/codio/workspace/Text-Based-Game/CMakeFiles 2 - $(MAKE) -f CMakeFiles/Makefile2 classes/GameWindow/CMakeFiles/window.dir/all + $(MAKE) -f CMakeFiles/Makefile2 src/CMakeFiles/window.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/codio/workspace/Text-Based-Game/CMakeFiles 0 -.PHONY : classes/GameWindow/CMakeFiles/window.dir/rule +.PHONY : src/CMakeFiles/window.dir/rule # Convenience name for target. -window: classes/GameWindow/CMakeFiles/window.dir/rule +window: src/CMakeFiles/window.dir/rule .PHONY : window # clean rule for target. -classes/GameWindow/CMakeFiles/window.dir/clean: - $(MAKE) -f classes/GameWindow/CMakeFiles/window.dir/build.make classes/GameWindow/CMakeFiles/window.dir/clean -.PHONY : classes/GameWindow/CMakeFiles/window.dir/clean +src/CMakeFiles/window.dir/clean: + $(MAKE) -f src/CMakeFiles/window.dir/build.make src/CMakeFiles/window.dir/clean +.PHONY : src/CMakeFiles/window.dir/clean # clean rule for target. -clean: classes/GameWindow/CMakeFiles/window.dir/clean +clean: src/CMakeFiles/window.dir/clean .PHONY : clean diff --git a/CMakeFiles/TargetDirectories.txt b/CMakeFiles/TargetDirectories.txt index f0c7461..9d16fad 100644 --- a/CMakeFiles/TargetDirectories.txt +++ b/CMakeFiles/TargetDirectories.txt @@ -1,9 +1,7 @@ /home/codio/workspace/Text-Based-Game/CMakeFiles/rebuild_cache.dir /home/codio/workspace/Text-Based-Game/CMakeFiles/main.dir /home/codio/workspace/Text-Based-Game/CMakeFiles/edit_cache.dir -/home/codio/workspace/Text-Based-Game/classes/Game/CMakeFiles/rebuild_cache.dir -/home/codio/workspace/Text-Based-Game/classes/Game/CMakeFiles/game.dir -/home/codio/workspace/Text-Based-Game/classes/Game/CMakeFiles/edit_cache.dir -/home/codio/workspace/Text-Based-Game/classes/GameWindow/CMakeFiles/rebuild_cache.dir -/home/codio/workspace/Text-Based-Game/classes/GameWindow/CMakeFiles/window.dir -/home/codio/workspace/Text-Based-Game/classes/GameWindow/CMakeFiles/edit_cache.dir +/home/codio/workspace/Text-Based-Game/src/CMakeFiles/edit_cache.dir +/home/codio/workspace/Text-Based-Game/src/CMakeFiles/game.dir +/home/codio/workspace/Text-Based-Game/src/CMakeFiles/rebuild_cache.dir +/home/codio/workspace/Text-Based-Game/src/CMakeFiles/window.dir diff --git a/CMakeFiles/main.dir/CXX.includecache b/CMakeFiles/main.dir/CXX.includecache index 057af05..015cd61 100644 --- a/CMakeFiles/main.dir/CXX.includecache +++ b/CMakeFiles/main.dir/CXX.includecache @@ -6,10 +6,6 @@ #IncludeRegexTransform: -/home/codio/workspace/Text-Based-Game/classes/Game/Game.hpp -ncurses.h -- - /home/codio/workspace/Text-Based-Game/main.cpp iostream - @@ -19,6 +15,10 @@ algorithm - string - -classes/Game/Game.hpp -/home/codio/workspace/Text-Based-Game/classes/Game/Game.hpp +src/Game.hpp +/home/codio/workspace/Text-Based-Game/src/Game.hpp + +/home/codio/workspace/Text-Based-Game/src/Game.hpp +ncurses.h +- diff --git a/CMakeFiles/main.dir/DependInfo.cmake b/CMakeFiles/main.dir/DependInfo.cmake index 96fe17a..6d171de 100644 --- a/CMakeFiles/main.dir/DependInfo.cmake +++ b/CMakeFiles/main.dir/DependInfo.cmake @@ -14,8 +14,8 @@ set(CMAKE_CXX_TARGET_INCLUDE_PATH # Targets to which this target links. set(CMAKE_TARGET_LINKED_INFO_FILES - "/home/codio/workspace/Text-Based-Game/classes/Game/CMakeFiles/game.dir/DependInfo.cmake" - "/home/codio/workspace/Text-Based-Game/classes/GameWindow/CMakeFiles/window.dir/DependInfo.cmake" + "/home/codio/workspace/Text-Based-Game/src/CMakeFiles/game.dir/DependInfo.cmake" + "/home/codio/workspace/Text-Based-Game/src/CMakeFiles/window.dir/DependInfo.cmake" ) # Fortran module output directory. diff --git a/CMakeFiles/main.dir/depend.internal b/CMakeFiles/main.dir/depend.internal index 07f3e7a..e758920 100644 --- a/CMakeFiles/main.dir/depend.internal +++ b/CMakeFiles/main.dir/depend.internal @@ -2,5 +2,5 @@ # Generated by "Unix Makefiles" Generator, CMake Version 3.10 CMakeFiles/main.dir/main.cpp.o - /home/codio/workspace/Text-Based-Game/classes/Game/Game.hpp /home/codio/workspace/Text-Based-Game/main.cpp + /home/codio/workspace/Text-Based-Game/src/Game.hpp diff --git a/CMakeFiles/main.dir/depend.make b/CMakeFiles/main.dir/depend.make index 3b35630..3ae8ba3 100644 --- a/CMakeFiles/main.dir/depend.make +++ b/CMakeFiles/main.dir/depend.make @@ -1,6 +1,6 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.10 -CMakeFiles/main.dir/main.cpp.o: classes/Game/Game.hpp CMakeFiles/main.dir/main.cpp.o: main.cpp +CMakeFiles/main.dir/main.cpp.o: src/Game.hpp diff --git a/CMakeFiles/main.dir/flags.make b/CMakeFiles/main.dir/flags.make index 72e257a..ac36da2 100644 --- a/CMakeFiles/main.dir/flags.make +++ b/CMakeFiles/main.dir/flags.make @@ -2,7 +2,7 @@ # Generated by "Unix Makefiles" Generator, CMake Version 3.10 # compile CXX with /usr/bin/c++ -CXX_FLAGS = -std=gnu++14 +CXX_FLAGS = -lncursesw -std=gnu++14 CXX_DEFINES = diff --git a/CMakeLists.txt b/CMakeLists.txt index 673f01e..57a32f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,10 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/obj) find_package(Curses REQUIRED) include_directories(${CURSES_INCLUDE_DIR}) -add_subdirectory(${CMAKE_SOURCE_DIR}/classes/Game) -add_subdirectory(${CMAKE_SOURCE_DIR}/classes/GameWindow) +add_subdirectory(${CMAKE_SOURCE_DIR}/src) + + +add_compile_options(-lncursesw) add_executable(main main.cpp) target_link_libraries(main game window ${CURSES_LIBRARIES}) diff --git a/Makefile b/Makefile index aec7588..ac672c2 100644 --- a/Makefile +++ b/Makefile @@ -133,7 +133,7 @@ game: cmake_check_build_system # fast build rule for target. game/fast: - $(MAKE) -f classes/Game/CMakeFiles/game.dir/build.make classes/Game/CMakeFiles/game.dir/build + $(MAKE) -f src/CMakeFiles/game.dir/build.make src/CMakeFiles/game.dir/build .PHONY : game/fast #============================================================================= @@ -146,7 +146,7 @@ window: cmake_check_build_system # fast build rule for target. window/fast: - $(MAKE) -f classes/GameWindow/CMakeFiles/window.dir/build.make classes/GameWindow/CMakeFiles/window.dir/build + $(MAKE) -f src/CMakeFiles/window.dir/build.make src/CMakeFiles/window.dir/build .PHONY : window/fast main.o: main.cpp.o diff --git a/src/SplitString/split_test.cpp b/Testing/split_test.cpp similarity index 92% rename from src/SplitString/split_test.cpp rename to Testing/split_test.cpp index 4f5299b..88f6491 100644 --- a/src/SplitString/split_test.cpp +++ b/Testing/split_test.cpp @@ -1,5 +1,5 @@ #include -#include "SplitString.hpp" +#include "src/SplitString.hpp" using namespace std; int main() diff --git a/bin/main b/bin/main index 8a4f91e..f711332 100755 Binary files a/bin/main and b/bin/main differ diff --git a/bkp.CMakeLists.txt b/bkp.CMakeLists.txt deleted file mode 100644 index d62f684..0000000 --- a/bkp.CMakeLists.txt +++ /dev/null @@ -1,55 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -project(Text_Based_Game CXX) - -file(MAKE_DIRECTORY ${Text_Based_Game_SOURCE_DIR}/bin) -file(MAKE_DIRECTORY ${Text_Based_Game_SOURCE_DIR}/classes) -file(MAKE_DIRECTORY ${Text_Based_Game_SOURCE_DIR}/classes/Game) -file(MAKE_DIRECTORY ${Text_Based_Game_SOURCE_DIR}/classes/GameWindow) -file(MAKE_DIRECTORY ${Text_Based_Game_SOURCE_DIR}/classes/Hero) -file(MAKE_DIRECTORY ${Text_Based_Game_SOURCE_DIR}/lib) -file(MAKE_DIRECTORY ${Text_Based_Game_SOURCE_DIR}/src) -file(MAKE_DIRECTORY ${Text_Based_Game_SOURCE_DIR}/Database) -file(MAKE_DIRECTORY ${Text_Based_Game_SOURCE_DIR}/Testing) - -# add_subdirectory(src) -#add_subdirectory(classes/Game) -#add_subdirectory(classes/GameWindow) -#add_subdirectory(Database) -#add_subdirectory(Testing) - -#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMake_Test_SOURCE_DIR}/bin) -#set(LIBRARY_OUTPUT_PATH ${CMake_Test_SOURCE_DIR}/obj) -# set(GAME_FILES Game.cpp GameWindow.cpp ${Text_Based_Game_SOURCE_DIR}/classes/Game/Game.hpp ${Text_Based_Game_SOURCE_DIR}/classes/GameWindow/GameWindow.hpp) - -file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/lib) -SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/lib) - -find_package(Curses REQUIRED) -include_directories(${CURSES_INCLUDE_DIR}) - -add_subdirectory(${CMAKE_SOURCE_DIR}/classes/Game) -#include_directories( ${CMAKE_SOURCE_DIR}/classes/Game ) -#add_library( game ${CMAKE_SOURCE_DIR}/classes/Game/Game.cpp ) - -add_subdirectory(${CMAKE_SOURCE_DIR}/classes/GameWindow) -#include_directories( ${CMAKE_SOURCE_DIR}/classes/GameWindow ) -#add_library( window ${CMAKE_SOURCE_DIR}/classes/GameWindow/GameWindow.cpp ) - -add_executable( main main.cpp ) -target_link_libraries( main game window ${CURSES_LIBRARIES} ) - - -#include_directories(${CMake_Test_SOURCE_DIR}/classes/Game) -#include_directories(${CMake_Test_SOURCE_DIR}/classes/GameWindow) - -# target_include_directories(headers PRIVATE ${CMake_Test_SOURCE_DIR}/classes) -# add_library(game_window ${CMake_Test_SOURCE_DIR}/classes/GameWindow/GameWindow.cpp) - -#add_library(game classes/Game/Game.cpp) -#add_library(gamewindow classes/GameWindow/GameWindow.cpp) - -#add_executable(main main.cpp) -#target_link_libraries(main game window ${CURSES_LIBRARIES}) diff --git a/classes/Game/CMakeFiles/CMakeDirectoryInformation.cmake b/classes/Game/CMakeFiles/CMakeDirectoryInformation.cmake deleted file mode 100644 index 1d1513b..0000000 --- a/classes/Game/CMakeFiles/CMakeDirectoryInformation.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.10 - -# Relative path conversion top directories. -set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/codio/workspace/Text-Based-Game") -set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/codio/workspace/Text-Based-Game") - -# Force unix paths in dependencies. -set(CMAKE_FORCE_UNIX_PATHS 1) - - -# The C and CXX include file regular expressions for this directory. -set(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$") -set(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$") -set(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN}) -set(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN}) diff --git a/classes/Game/CMakeFiles/game.dir/CXX.includecache b/classes/Game/CMakeFiles/game.dir/CXX.includecache deleted file mode 100644 index 4dc4b44..0000000 --- a/classes/Game/CMakeFiles/game.dir/CXX.includecache +++ /dev/null @@ -1,30 +0,0 @@ -#IncludeRegexLine: ^[ ]*[#%][ ]*(include|import)[ ]*[<"]([^">]+)([">]) - -#IncludeRegexScan: ^.*$ - -#IncludeRegexComplain: ^$ - -#IncludeRegexTransform: - -/home/codio/workspace/Text-Based-Game/classes/Game/Game.cpp -string -- -Game.hpp -/home/codio/workspace/Text-Based-Game/classes/Game/Game.hpp -ncurses.h -- -../GameWindow/GameWindow.hpp -/home/codio/workspace/Text-Based-Game/classes/GameWindow/GameWindow.hpp - -/home/codio/workspace/Text-Based-Game/classes/Game/Game.hpp -ncurses.h -- - -/home/codio/workspace/Text-Based-Game/classes/GameWindow/GameWindow.hpp -ncurses.h -- -string -- -vector -- - diff --git a/classes/Game/CMakeFiles/game.dir/DependInfo.cmake b/classes/Game/CMakeFiles/game.dir/DependInfo.cmake deleted file mode 100644 index cc566f0..0000000 --- a/classes/Game/CMakeFiles/game.dir/DependInfo.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# The set of languages for which implicit dependencies are needed: -set(CMAKE_DEPENDS_LANGUAGES - "CXX" - ) -# The set of files for implicit dependencies of each language: -set(CMAKE_DEPENDS_CHECK_CXX - "/home/codio/workspace/Text-Based-Game/classes/Game/Game.cpp" "/home/codio/workspace/Text-Based-Game/classes/Game/CMakeFiles/game.dir/Game.cpp.o" - ) -set(CMAKE_CXX_COMPILER_ID "GNU") - -# The include file search paths: -set(CMAKE_CXX_TARGET_INCLUDE_PATH - ) - -# Targets to which this target links. -set(CMAKE_TARGET_LINKED_INFO_FILES - ) - -# Fortran module output directory. -set(CMAKE_Fortran_TARGET_MODULE_DIR "") diff --git a/classes/Game/CMakeFiles/game.dir/Game.cpp.o b/classes/Game/CMakeFiles/game.dir/Game.cpp.o deleted file mode 100644 index 0e1d243..0000000 Binary files a/classes/Game/CMakeFiles/game.dir/Game.cpp.o and /dev/null differ diff --git a/classes/Game/CMakeFiles/game.dir/build.make b/classes/Game/CMakeFiles/game.dir/build.make deleted file mode 100644 index 93d5c36..0000000 --- a/classes/Game/CMakeFiles/game.dir/build.make +++ /dev/null @@ -1,114 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.10 - -# Delete rule output on recipe failure. -.DELETE_ON_ERROR: - - -#============================================================================= -# Special targets provided by cmake. - -# Disable implicit rules so canonical targets will work. -.SUFFIXES: - - -# Remove some rules from gmake that .SUFFIXES does not remove. -SUFFIXES = - -.SUFFIXES: .hpux_make_needs_suffix_list - - -# Suppress display of executed commands. -$(VERBOSE).SILENT: - - -# A target that is always out of date. -cmake_force: - -.PHONY : cmake_force - -#============================================================================= -# Set environment variables for the build. - -# The shell in which to execute make rules. -SHELL = /bin/sh - -# The CMake executable. -CMAKE_COMMAND = /usr/bin/cmake - -# The command to remove a file. -RM = /usr/bin/cmake -E remove -f - -# Escaping for special characters. -EQUALS = = - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /home/codio/workspace/Text-Based-Game - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /home/codio/workspace/Text-Based-Game - -# Include any dependencies generated for this target. -include classes/Game/CMakeFiles/game.dir/depend.make - -# Include the progress variables for this target. -include classes/Game/CMakeFiles/game.dir/progress.make - -# Include the compile flags for this target's objects. -include classes/Game/CMakeFiles/game.dir/flags.make - -classes/Game/CMakeFiles/game.dir/Game.cpp.o: classes/Game/CMakeFiles/game.dir/flags.make -classes/Game/CMakeFiles/game.dir/Game.cpp.o: classes/Game/Game.cpp - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/codio/workspace/Text-Based-Game/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object classes/Game/CMakeFiles/game.dir/Game.cpp.o" - cd /home/codio/workspace/Text-Based-Game/classes/Game && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/game.dir/Game.cpp.o -c /home/codio/workspace/Text-Based-Game/classes/Game/Game.cpp - -classes/Game/CMakeFiles/game.dir/Game.cpp.i: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/game.dir/Game.cpp.i" - cd /home/codio/workspace/Text-Based-Game/classes/Game && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/codio/workspace/Text-Based-Game/classes/Game/Game.cpp > CMakeFiles/game.dir/Game.cpp.i - -classes/Game/CMakeFiles/game.dir/Game.cpp.s: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/game.dir/Game.cpp.s" - cd /home/codio/workspace/Text-Based-Game/classes/Game && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/codio/workspace/Text-Based-Game/classes/Game/Game.cpp -o CMakeFiles/game.dir/Game.cpp.s - -classes/Game/CMakeFiles/game.dir/Game.cpp.o.requires: - -.PHONY : classes/Game/CMakeFiles/game.dir/Game.cpp.o.requires - -classes/Game/CMakeFiles/game.dir/Game.cpp.o.provides: classes/Game/CMakeFiles/game.dir/Game.cpp.o.requires - $(MAKE) -f classes/Game/CMakeFiles/game.dir/build.make classes/Game/CMakeFiles/game.dir/Game.cpp.o.provides.build -.PHONY : classes/Game/CMakeFiles/game.dir/Game.cpp.o.provides - -classes/Game/CMakeFiles/game.dir/Game.cpp.o.provides.build: classes/Game/CMakeFiles/game.dir/Game.cpp.o - - -# Object files for target game -game_OBJECTS = \ -"CMakeFiles/game.dir/Game.cpp.o" - -# External object files for target game -game_EXTERNAL_OBJECTS = - -obj/libgame.a: classes/Game/CMakeFiles/game.dir/Game.cpp.o -obj/libgame.a: classes/Game/CMakeFiles/game.dir/build.make -obj/libgame.a: classes/Game/CMakeFiles/game.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/codio/workspace/Text-Based-Game/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX static library ../../obj/libgame.a" - cd /home/codio/workspace/Text-Based-Game/classes/Game && $(CMAKE_COMMAND) -P CMakeFiles/game.dir/cmake_clean_target.cmake - cd /home/codio/workspace/Text-Based-Game/classes/Game && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/game.dir/link.txt --verbose=$(VERBOSE) - -# Rule to build all files generated by this target. -classes/Game/CMakeFiles/game.dir/build: obj/libgame.a - -.PHONY : classes/Game/CMakeFiles/game.dir/build - -classes/Game/CMakeFiles/game.dir/requires: classes/Game/CMakeFiles/game.dir/Game.cpp.o.requires - -.PHONY : classes/Game/CMakeFiles/game.dir/requires - -classes/Game/CMakeFiles/game.dir/clean: - cd /home/codio/workspace/Text-Based-Game/classes/Game && $(CMAKE_COMMAND) -P CMakeFiles/game.dir/cmake_clean.cmake -.PHONY : classes/Game/CMakeFiles/game.dir/clean - -classes/Game/CMakeFiles/game.dir/depend: - cd /home/codio/workspace/Text-Based-Game && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/codio/workspace/Text-Based-Game /home/codio/workspace/Text-Based-Game/classes/Game /home/codio/workspace/Text-Based-Game /home/codio/workspace/Text-Based-Game/classes/Game /home/codio/workspace/Text-Based-Game/classes/Game/CMakeFiles/game.dir/DependInfo.cmake --color=$(COLOR) -.PHONY : classes/Game/CMakeFiles/game.dir/depend - diff --git a/classes/Game/CMakeFiles/game.dir/cmake_clean.cmake b/classes/Game/CMakeFiles/game.dir/cmake_clean.cmake deleted file mode 100644 index 72b2f23..0000000 --- a/classes/Game/CMakeFiles/game.dir/cmake_clean.cmake +++ /dev/null @@ -1,10 +0,0 @@ -file(REMOVE_RECURSE - "CMakeFiles/game.dir/Game.cpp.o" - "../../obj/libgame.pdb" - "../../obj/libgame.a" -) - -# Per-language clean rules from dependency scanning. -foreach(lang CXX) - include(CMakeFiles/game.dir/cmake_clean_${lang}.cmake OPTIONAL) -endforeach() diff --git a/classes/Game/CMakeFiles/game.dir/cmake_clean_target.cmake b/classes/Game/CMakeFiles/game.dir/cmake_clean_target.cmake deleted file mode 100644 index 655471a..0000000 --- a/classes/Game/CMakeFiles/game.dir/cmake_clean_target.cmake +++ /dev/null @@ -1,3 +0,0 @@ -file(REMOVE_RECURSE - "../../obj/libgame.a" -) diff --git a/classes/Game/CMakeFiles/game.dir/depend.internal b/classes/Game/CMakeFiles/game.dir/depend.internal deleted file mode 100644 index fb4d40d..0000000 --- a/classes/Game/CMakeFiles/game.dir/depend.internal +++ /dev/null @@ -1,7 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.10 - -classes/Game/CMakeFiles/game.dir/Game.cpp.o - /home/codio/workspace/Text-Based-Game/classes/Game/Game.cpp - /home/codio/workspace/Text-Based-Game/classes/Game/Game.hpp - /home/codio/workspace/Text-Based-Game/classes/GameWindow/GameWindow.hpp diff --git a/classes/Game/CMakeFiles/game.dir/depend.make b/classes/Game/CMakeFiles/game.dir/depend.make deleted file mode 100644 index bca1228..0000000 --- a/classes/Game/CMakeFiles/game.dir/depend.make +++ /dev/null @@ -1,7 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.10 - -classes/Game/CMakeFiles/game.dir/Game.cpp.o: classes/Game/Game.cpp -classes/Game/CMakeFiles/game.dir/Game.cpp.o: classes/Game/Game.hpp -classes/Game/CMakeFiles/game.dir/Game.cpp.o: classes/GameWindow/GameWindow.hpp - diff --git a/classes/Game/CMakeFiles/game.dir/flags.make b/classes/Game/CMakeFiles/game.dir/flags.make deleted file mode 100644 index 72e257a..0000000 --- a/classes/Game/CMakeFiles/game.dir/flags.make +++ /dev/null @@ -1,10 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.10 - -# compile CXX with /usr/bin/c++ -CXX_FLAGS = -std=gnu++14 - -CXX_DEFINES = - -CXX_INCLUDES = - diff --git a/classes/Game/CMakeFiles/game.dir/link.txt b/classes/Game/CMakeFiles/game.dir/link.txt deleted file mode 100644 index 5ca7b55..0000000 --- a/classes/Game/CMakeFiles/game.dir/link.txt +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/ar qc ../../obj/libgame.a CMakeFiles/game.dir/Game.cpp.o -/usr/bin/ranlib ../../obj/libgame.a diff --git a/classes/Game/CMakeFiles/game.dir/progress.make b/classes/Game/CMakeFiles/game.dir/progress.make deleted file mode 100644 index abadeb0..0000000 --- a/classes/Game/CMakeFiles/game.dir/progress.make +++ /dev/null @@ -1,3 +0,0 @@ -CMAKE_PROGRESS_1 = 1 -CMAKE_PROGRESS_2 = 2 - diff --git a/classes/Game/CMakeFiles/progress.marks b/classes/Game/CMakeFiles/progress.marks deleted file mode 100644 index 0cfbf08..0000000 --- a/classes/Game/CMakeFiles/progress.marks +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/classes/Game/CMakeLists.txt b/classes/Game/CMakeLists.txt deleted file mode 100644 index c1158bd..0000000 --- a/classes/Game/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_library(game Game.cpp) \ No newline at end of file diff --git a/classes/Game/Makefile b/classes/Game/Makefile deleted file mode 100644 index 82dc7ba..0000000 --- a/classes/Game/Makefile +++ /dev/null @@ -1,180 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.10 - -# Default target executed when no arguments are given to make. -default_target: all - -.PHONY : default_target - -# Allow only one "make -f Makefile2" at a time, but pass parallelism. -.NOTPARALLEL: - - -#============================================================================= -# Special targets provided by cmake. - -# Disable implicit rules so canonical targets will work. -.SUFFIXES: - - -# Remove some rules from gmake that .SUFFIXES does not remove. -SUFFIXES = - -.SUFFIXES: .hpux_make_needs_suffix_list - - -# Suppress display of executed commands. -$(VERBOSE).SILENT: - - -# A target that is always out of date. -cmake_force: - -.PHONY : cmake_force - -#============================================================================= -# Set environment variables for the build. - -# The shell in which to execute make rules. -SHELL = /bin/sh - -# The CMake executable. -CMAKE_COMMAND = /usr/bin/cmake - -# The command to remove a file. -RM = /usr/bin/cmake -E remove -f - -# Escaping for special characters. -EQUALS = = - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /home/codio/workspace/Text-Based-Game - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /home/codio/workspace/Text-Based-Game - -#============================================================================= -# Targets provided globally by CMake. - -# Special rule for the target rebuild_cache -rebuild_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." - /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -.PHONY : rebuild_cache - -# Special rule for the target rebuild_cache -rebuild_cache/fast: rebuild_cache - -.PHONY : rebuild_cache/fast - -# Special rule for the target edit_cache -edit_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..." - /usr/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. -.PHONY : edit_cache - -# Special rule for the target edit_cache -edit_cache/fast: edit_cache - -.PHONY : edit_cache/fast - -# The main all target -all: cmake_check_build_system - cd /home/codio/workspace/Text-Based-Game && $(CMAKE_COMMAND) -E cmake_progress_start /home/codio/workspace/Text-Based-Game/CMakeFiles /home/codio/workspace/Text-Based-Game/classes/Game/CMakeFiles/progress.marks - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 classes/Game/all - $(CMAKE_COMMAND) -E cmake_progress_start /home/codio/workspace/Text-Based-Game/CMakeFiles 0 -.PHONY : all - -# The main clean target -clean: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 classes/Game/clean -.PHONY : clean - -# The main clean target -clean/fast: clean - -.PHONY : clean/fast - -# Prepare targets for installation. -preinstall: all - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 classes/Game/preinstall -.PHONY : preinstall - -# Prepare targets for installation. -preinstall/fast: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 classes/Game/preinstall -.PHONY : preinstall/fast - -# clear depends -depend: - cd /home/codio/workspace/Text-Based-Game && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 -.PHONY : depend - -# Convenience name for target. -classes/Game/CMakeFiles/game.dir/rule: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 classes/Game/CMakeFiles/game.dir/rule -.PHONY : classes/Game/CMakeFiles/game.dir/rule - -# Convenience name for target. -game: classes/Game/CMakeFiles/game.dir/rule - -.PHONY : game - -# fast build rule for target. -game/fast: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f classes/Game/CMakeFiles/game.dir/build.make classes/Game/CMakeFiles/game.dir/build -.PHONY : game/fast - -Game.o: Game.cpp.o - -.PHONY : Game.o - -# target to build an object file -Game.cpp.o: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f classes/Game/CMakeFiles/game.dir/build.make classes/Game/CMakeFiles/game.dir/Game.cpp.o -.PHONY : Game.cpp.o - -Game.i: Game.cpp.i - -.PHONY : Game.i - -# target to preprocess a source file -Game.cpp.i: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f classes/Game/CMakeFiles/game.dir/build.make classes/Game/CMakeFiles/game.dir/Game.cpp.i -.PHONY : Game.cpp.i - -Game.s: Game.cpp.s - -.PHONY : Game.s - -# target to generate assembly for a file -Game.cpp.s: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f classes/Game/CMakeFiles/game.dir/build.make classes/Game/CMakeFiles/game.dir/Game.cpp.s -.PHONY : Game.cpp.s - -# Help Target -help: - @echo "The following are some of the valid targets for this Makefile:" - @echo "... all (the default if no target is provided)" - @echo "... clean" - @echo "... depend" - @echo "... rebuild_cache" - @echo "... game" - @echo "... edit_cache" - @echo "... Game.o" - @echo "... Game.i" - @echo "... Game.s" -.PHONY : help - - - -#============================================================================= -# Special targets to cleanup operation of make. - -# Special rule to run CMake to check the build system integrity. -# No rule that depends on this can have commands that come from listfiles -# because they might be regenerated. -cmake_check_build_system: - cd /home/codio/workspace/Text-Based-Game && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 -.PHONY : cmake_check_build_system - diff --git a/classes/GameWindow/CMakeFiles/CMakeDirectoryInformation.cmake b/classes/GameWindow/CMakeFiles/CMakeDirectoryInformation.cmake deleted file mode 100644 index 1d1513b..0000000 --- a/classes/GameWindow/CMakeFiles/CMakeDirectoryInformation.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.10 - -# Relative path conversion top directories. -set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/codio/workspace/Text-Based-Game") -set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/codio/workspace/Text-Based-Game") - -# Force unix paths in dependencies. -set(CMAKE_FORCE_UNIX_PATHS 1) - - -# The C and CXX include file regular expressions for this directory. -set(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$") -set(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$") -set(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN}) -set(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN}) diff --git a/classes/GameWindow/CMakeFiles/progress.marks b/classes/GameWindow/CMakeFiles/progress.marks deleted file mode 100644 index 0cfbf08..0000000 --- a/classes/GameWindow/CMakeFiles/progress.marks +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/classes/GameWindow/CMakeFiles/window.dir/CXX.includecache b/classes/GameWindow/CMakeFiles/window.dir/CXX.includecache deleted file mode 100644 index 7b7de8d..0000000 --- a/classes/GameWindow/CMakeFiles/window.dir/CXX.includecache +++ /dev/null @@ -1,28 +0,0 @@ -#IncludeRegexLine: ^[ ]*[#%][ ]*(include|import)[ ]*[<"]([^">]+)([">]) - -#IncludeRegexScan: ^.*$ - -#IncludeRegexComplain: ^$ - -#IncludeRegexTransform: - -/home/codio/workspace/Text-Based-Game/classes/GameWindow/GameWindow.cpp -string -- -GameWindow.hpp -/home/codio/workspace/Text-Based-Game/classes/GameWindow/GameWindow.hpp -ncurses.h -- -menu.h -- -algorithm -- - -/home/codio/workspace/Text-Based-Game/classes/GameWindow/GameWindow.hpp -ncurses.h -- -string -- -vector -- - diff --git a/classes/GameWindow/CMakeFiles/window.dir/DependInfo.cmake b/classes/GameWindow/CMakeFiles/window.dir/DependInfo.cmake deleted file mode 100644 index 2895d77..0000000 --- a/classes/GameWindow/CMakeFiles/window.dir/DependInfo.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# The set of languages for which implicit dependencies are needed: -set(CMAKE_DEPENDS_LANGUAGES - "CXX" - ) -# The set of files for implicit dependencies of each language: -set(CMAKE_DEPENDS_CHECK_CXX - "/home/codio/workspace/Text-Based-Game/classes/GameWindow/GameWindow.cpp" "/home/codio/workspace/Text-Based-Game/classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o" - ) -set(CMAKE_CXX_COMPILER_ID "GNU") - -# The include file search paths: -set(CMAKE_CXX_TARGET_INCLUDE_PATH - ) - -# Targets to which this target links. -set(CMAKE_TARGET_LINKED_INFO_FILES - ) - -# Fortran module output directory. -set(CMAKE_Fortran_TARGET_MODULE_DIR "") diff --git a/classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o b/classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o deleted file mode 100644 index d36592d..0000000 Binary files a/classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o and /dev/null differ diff --git a/classes/GameWindow/CMakeFiles/window.dir/build.make b/classes/GameWindow/CMakeFiles/window.dir/build.make deleted file mode 100644 index 012c483..0000000 --- a/classes/GameWindow/CMakeFiles/window.dir/build.make +++ /dev/null @@ -1,114 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.10 - -# Delete rule output on recipe failure. -.DELETE_ON_ERROR: - - -#============================================================================= -# Special targets provided by cmake. - -# Disable implicit rules so canonical targets will work. -.SUFFIXES: - - -# Remove some rules from gmake that .SUFFIXES does not remove. -SUFFIXES = - -.SUFFIXES: .hpux_make_needs_suffix_list - - -# Suppress display of executed commands. -$(VERBOSE).SILENT: - - -# A target that is always out of date. -cmake_force: - -.PHONY : cmake_force - -#============================================================================= -# Set environment variables for the build. - -# The shell in which to execute make rules. -SHELL = /bin/sh - -# The CMake executable. -CMAKE_COMMAND = /usr/bin/cmake - -# The command to remove a file. -RM = /usr/bin/cmake -E remove -f - -# Escaping for special characters. -EQUALS = = - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /home/codio/workspace/Text-Based-Game - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /home/codio/workspace/Text-Based-Game - -# Include any dependencies generated for this target. -include classes/GameWindow/CMakeFiles/window.dir/depend.make - -# Include the progress variables for this target. -include classes/GameWindow/CMakeFiles/window.dir/progress.make - -# Include the compile flags for this target's objects. -include classes/GameWindow/CMakeFiles/window.dir/flags.make - -classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o: classes/GameWindow/CMakeFiles/window.dir/flags.make -classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o: classes/GameWindow/GameWindow.cpp - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/codio/workspace/Text-Based-Game/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o" - cd /home/codio/workspace/Text-Based-Game/classes/GameWindow && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/window.dir/GameWindow.cpp.o -c /home/codio/workspace/Text-Based-Game/classes/GameWindow/GameWindow.cpp - -classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.i: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/window.dir/GameWindow.cpp.i" - cd /home/codio/workspace/Text-Based-Game/classes/GameWindow && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/codio/workspace/Text-Based-Game/classes/GameWindow/GameWindow.cpp > CMakeFiles/window.dir/GameWindow.cpp.i - -classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.s: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/window.dir/GameWindow.cpp.s" - cd /home/codio/workspace/Text-Based-Game/classes/GameWindow && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/codio/workspace/Text-Based-Game/classes/GameWindow/GameWindow.cpp -o CMakeFiles/window.dir/GameWindow.cpp.s - -classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o.requires: - -.PHONY : classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o.requires - -classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o.provides: classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o.requires - $(MAKE) -f classes/GameWindow/CMakeFiles/window.dir/build.make classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o.provides.build -.PHONY : classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o.provides - -classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o.provides.build: classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o - - -# Object files for target window -window_OBJECTS = \ -"CMakeFiles/window.dir/GameWindow.cpp.o" - -# External object files for target window -window_EXTERNAL_OBJECTS = - -obj/libwindow.a: classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o -obj/libwindow.a: classes/GameWindow/CMakeFiles/window.dir/build.make -obj/libwindow.a: classes/GameWindow/CMakeFiles/window.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/codio/workspace/Text-Based-Game/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX static library ../../obj/libwindow.a" - cd /home/codio/workspace/Text-Based-Game/classes/GameWindow && $(CMAKE_COMMAND) -P CMakeFiles/window.dir/cmake_clean_target.cmake - cd /home/codio/workspace/Text-Based-Game/classes/GameWindow && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/window.dir/link.txt --verbose=$(VERBOSE) - -# Rule to build all files generated by this target. -classes/GameWindow/CMakeFiles/window.dir/build: obj/libwindow.a - -.PHONY : classes/GameWindow/CMakeFiles/window.dir/build - -classes/GameWindow/CMakeFiles/window.dir/requires: classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o.requires - -.PHONY : classes/GameWindow/CMakeFiles/window.dir/requires - -classes/GameWindow/CMakeFiles/window.dir/clean: - cd /home/codio/workspace/Text-Based-Game/classes/GameWindow && $(CMAKE_COMMAND) -P CMakeFiles/window.dir/cmake_clean.cmake -.PHONY : classes/GameWindow/CMakeFiles/window.dir/clean - -classes/GameWindow/CMakeFiles/window.dir/depend: - cd /home/codio/workspace/Text-Based-Game && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/codio/workspace/Text-Based-Game /home/codio/workspace/Text-Based-Game/classes/GameWindow /home/codio/workspace/Text-Based-Game /home/codio/workspace/Text-Based-Game/classes/GameWindow /home/codio/workspace/Text-Based-Game/classes/GameWindow/CMakeFiles/window.dir/DependInfo.cmake --color=$(COLOR) -.PHONY : classes/GameWindow/CMakeFiles/window.dir/depend - diff --git a/classes/GameWindow/CMakeFiles/window.dir/cmake_clean.cmake b/classes/GameWindow/CMakeFiles/window.dir/cmake_clean.cmake deleted file mode 100644 index 19dde6c..0000000 --- a/classes/GameWindow/CMakeFiles/window.dir/cmake_clean.cmake +++ /dev/null @@ -1,10 +0,0 @@ -file(REMOVE_RECURSE - "CMakeFiles/window.dir/GameWindow.cpp.o" - "../../obj/libwindow.pdb" - "../../obj/libwindow.a" -) - -# Per-language clean rules from dependency scanning. -foreach(lang CXX) - include(CMakeFiles/window.dir/cmake_clean_${lang}.cmake OPTIONAL) -endforeach() diff --git a/classes/GameWindow/CMakeFiles/window.dir/cmake_clean_target.cmake b/classes/GameWindow/CMakeFiles/window.dir/cmake_clean_target.cmake deleted file mode 100644 index 9594830..0000000 --- a/classes/GameWindow/CMakeFiles/window.dir/cmake_clean_target.cmake +++ /dev/null @@ -1,3 +0,0 @@ -file(REMOVE_RECURSE - "../../obj/libwindow.a" -) diff --git a/classes/GameWindow/CMakeFiles/window.dir/depend.internal b/classes/GameWindow/CMakeFiles/window.dir/depend.internal deleted file mode 100644 index 216f693..0000000 --- a/classes/GameWindow/CMakeFiles/window.dir/depend.internal +++ /dev/null @@ -1,6 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.10 - -classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o - /home/codio/workspace/Text-Based-Game/classes/GameWindow/GameWindow.cpp - /home/codio/workspace/Text-Based-Game/classes/GameWindow/GameWindow.hpp diff --git a/classes/GameWindow/CMakeFiles/window.dir/depend.make b/classes/GameWindow/CMakeFiles/window.dir/depend.make deleted file mode 100644 index 00a2bee..0000000 --- a/classes/GameWindow/CMakeFiles/window.dir/depend.make +++ /dev/null @@ -1,6 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.10 - -classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o: classes/GameWindow/GameWindow.cpp -classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o: classes/GameWindow/GameWindow.hpp - diff --git a/classes/GameWindow/CMakeFiles/window.dir/flags.make b/classes/GameWindow/CMakeFiles/window.dir/flags.make deleted file mode 100644 index 72e257a..0000000 --- a/classes/GameWindow/CMakeFiles/window.dir/flags.make +++ /dev/null @@ -1,10 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.10 - -# compile CXX with /usr/bin/c++ -CXX_FLAGS = -std=gnu++14 - -CXX_DEFINES = - -CXX_INCLUDES = - diff --git a/classes/GameWindow/CMakeFiles/window.dir/link.txt b/classes/GameWindow/CMakeFiles/window.dir/link.txt deleted file mode 100644 index 3f2c10b..0000000 --- a/classes/GameWindow/CMakeFiles/window.dir/link.txt +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/ar qc ../../obj/libwindow.a CMakeFiles/window.dir/GameWindow.cpp.o -/usr/bin/ranlib ../../obj/libwindow.a diff --git a/classes/GameWindow/CMakeFiles/window.dir/progress.make b/classes/GameWindow/CMakeFiles/window.dir/progress.make deleted file mode 100644 index 3a86673..0000000 --- a/classes/GameWindow/CMakeFiles/window.dir/progress.make +++ /dev/null @@ -1,3 +0,0 @@ -CMAKE_PROGRESS_1 = 5 -CMAKE_PROGRESS_2 = 6 - diff --git a/classes/GameWindow/CMakeLists.txt b/classes/GameWindow/CMakeLists.txt deleted file mode 100644 index f7eaa2e..0000000 --- a/classes/GameWindow/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_library(window GameWindow.cpp) \ No newline at end of file diff --git a/classes/GameWindow/cmake_install.cmake b/classes/GameWindow/cmake_install.cmake deleted file mode 100644 index 1f12c61..0000000 --- a/classes/GameWindow/cmake_install.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# Install script for directory: /home/codio/workspace/Text-Based-Game/classes/GameWindow - -# Set the install prefix -if(NOT DEFINED CMAKE_INSTALL_PREFIX) - set(CMAKE_INSTALL_PREFIX "/usr/local") -endif() -string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - if(BUILD_TYPE) - string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - else() - set(CMAKE_INSTALL_CONFIG_NAME "") - endif() - message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -endif() - -# Set the component getting installed. -if(NOT CMAKE_INSTALL_COMPONENT) - if(COMPONENT) - message(STATUS "Install component: \"${COMPONENT}\"") - set(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - else() - set(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() - -# Is this installation the result of a crosscompile? -if(NOT DEFINED CMAKE_CROSSCOMPILING) - set(CMAKE_CROSSCOMPILING "FALSE") -endif() - diff --git a/cmake_install.cmake b/cmake_install.cmake index 549b969..beae7a8 100644 --- a/cmake_install.cmake +++ b/cmake_install.cmake @@ -39,8 +39,7 @@ endif() if(NOT CMAKE_INSTALL_LOCAL_ONLY) # Include the install script for each subdirectory. - include("/home/codio/workspace/Text-Based-Game/classes/Game/cmake_install.cmake") - include("/home/codio/workspace/Text-Based-Game/classes/GameWindow/cmake_install.cmake") + include("/home/codio/workspace/Text-Based-Game/src/cmake_install.cmake") endif() diff --git a/main.cpp b/main.cpp index b288eb5..a85bdb2 100644 --- a/main.cpp +++ b/main.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "classes/Game/Game.hpp" +#include "src/Game.hpp" using namespace std; int main(int argc, char **argv) diff --git a/obj/libgame.a b/obj/libgame.a index 5ee792c..8724302 100644 Binary files a/obj/libgame.a and b/obj/libgame.a differ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..841e957 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,2 @@ +add_library(game Game.cpp) +add_library(window GameWindow.cpp) \ No newline at end of file diff --git a/classes/Game/Game.cpp b/src/Game.cpp similarity index 94% rename from classes/Game/Game.cpp rename to src/Game.cpp index 1a7c8cc..179c459 100644 --- a/classes/Game/Game.cpp +++ b/src/Game.cpp @@ -1,7 +1,7 @@ #include #include "Game.hpp" #include -#include "../GameWindow/GameWindow.hpp" +#include "GameWindow.hpp" using namespace std; Game::Game(bool cbreak_present) diff --git a/classes/Game/Game.hpp b/src/Game.hpp similarity index 100% rename from classes/Game/Game.hpp rename to src/Game.hpp diff --git a/classes/GameWindow/GameWindow.cpp b/src/GameWindow.cpp similarity index 100% rename from classes/GameWindow/GameWindow.cpp rename to src/GameWindow.cpp diff --git a/classes/GameWindow/GameWindow.hpp b/src/GameWindow.hpp similarity index 100% rename from classes/GameWindow/GameWindow.hpp rename to src/GameWindow.hpp diff --git a/classes/GameWindow/Makefile b/src/Makefile similarity index 68% rename from classes/GameWindow/Makefile rename to src/Makefile index 53ebf7a..3d32e21 100644 --- a/classes/GameWindow/Makefile +++ b/src/Makefile @@ -56,17 +56,6 @@ CMAKE_BINARY_DIR = /home/codio/workspace/Text-Based-Game #============================================================================= # Targets provided globally by CMake. -# Special rule for the target rebuild_cache -rebuild_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." - /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -.PHONY : rebuild_cache - -# Special rule for the target rebuild_cache -rebuild_cache/fast: rebuild_cache - -.PHONY : rebuild_cache/fast - # Special rule for the target edit_cache edit_cache: @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..." @@ -78,16 +67,27 @@ edit_cache/fast: edit_cache .PHONY : edit_cache/fast +# Special rule for the target rebuild_cache +rebuild_cache: + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." + /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) +.PHONY : rebuild_cache + +# Special rule for the target rebuild_cache +rebuild_cache/fast: rebuild_cache + +.PHONY : rebuild_cache/fast + # The main all target all: cmake_check_build_system - cd /home/codio/workspace/Text-Based-Game && $(CMAKE_COMMAND) -E cmake_progress_start /home/codio/workspace/Text-Based-Game/CMakeFiles /home/codio/workspace/Text-Based-Game/classes/GameWindow/CMakeFiles/progress.marks - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 classes/GameWindow/all + cd /home/codio/workspace/Text-Based-Game && $(CMAKE_COMMAND) -E cmake_progress_start /home/codio/workspace/Text-Based-Game/CMakeFiles /home/codio/workspace/Text-Based-Game/src/CMakeFiles/progress.marks + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 src/all $(CMAKE_COMMAND) -E cmake_progress_start /home/codio/workspace/Text-Based-Game/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 classes/GameWindow/clean + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 src/clean .PHONY : clean # The main clean target @@ -97,12 +97,12 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 classes/GameWindow/preinstall + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 src/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 classes/GameWindow/preinstall + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 src/preinstall .PHONY : preinstall/fast # clear depends @@ -111,27 +111,69 @@ depend: .PHONY : depend # Convenience name for target. -classes/GameWindow/CMakeFiles/window.dir/rule: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 classes/GameWindow/CMakeFiles/window.dir/rule -.PHONY : classes/GameWindow/CMakeFiles/window.dir/rule +src/CMakeFiles/game.dir/rule: + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 src/CMakeFiles/game.dir/rule +.PHONY : src/CMakeFiles/game.dir/rule # Convenience name for target. -window: classes/GameWindow/CMakeFiles/window.dir/rule +game: src/CMakeFiles/game.dir/rule + +.PHONY : game + +# fast build rule for target. +game/fast: + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f src/CMakeFiles/game.dir/build.make src/CMakeFiles/game.dir/build +.PHONY : game/fast + +# Convenience name for target. +src/CMakeFiles/window.dir/rule: + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f CMakeFiles/Makefile2 src/CMakeFiles/window.dir/rule +.PHONY : src/CMakeFiles/window.dir/rule + +# Convenience name for target. +window: src/CMakeFiles/window.dir/rule .PHONY : window # fast build rule for target. window/fast: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f classes/GameWindow/CMakeFiles/window.dir/build.make classes/GameWindow/CMakeFiles/window.dir/build + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f src/CMakeFiles/window.dir/build.make src/CMakeFiles/window.dir/build .PHONY : window/fast +Game.o: Game.cpp.o + +.PHONY : Game.o + +# target to build an object file +Game.cpp.o: + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f src/CMakeFiles/game.dir/build.make src/CMakeFiles/game.dir/Game.cpp.o +.PHONY : Game.cpp.o + +Game.i: Game.cpp.i + +.PHONY : Game.i + +# target to preprocess a source file +Game.cpp.i: + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f src/CMakeFiles/game.dir/build.make src/CMakeFiles/game.dir/Game.cpp.i +.PHONY : Game.cpp.i + +Game.s: Game.cpp.s + +.PHONY : Game.s + +# target to generate assembly for a file +Game.cpp.s: + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f src/CMakeFiles/game.dir/build.make src/CMakeFiles/game.dir/Game.cpp.s +.PHONY : Game.cpp.s + GameWindow.o: GameWindow.cpp.o .PHONY : GameWindow.o # target to build an object file GameWindow.cpp.o: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f classes/GameWindow/CMakeFiles/window.dir/build.make classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f src/CMakeFiles/window.dir/build.make src/CMakeFiles/window.dir/GameWindow.cpp.o .PHONY : GameWindow.cpp.o GameWindow.i: GameWindow.cpp.i @@ -140,7 +182,7 @@ GameWindow.i: GameWindow.cpp.i # target to preprocess a source file GameWindow.cpp.i: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f classes/GameWindow/CMakeFiles/window.dir/build.make classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.i + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f src/CMakeFiles/window.dir/build.make src/CMakeFiles/window.dir/GameWindow.cpp.i .PHONY : GameWindow.cpp.i GameWindow.s: GameWindow.cpp.s @@ -149,7 +191,7 @@ GameWindow.s: GameWindow.cpp.s # target to generate assembly for a file GameWindow.cpp.s: - cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f classes/GameWindow/CMakeFiles/window.dir/build.make classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.s + cd /home/codio/workspace/Text-Based-Game && $(MAKE) -f src/CMakeFiles/window.dir/build.make src/CMakeFiles/window.dir/GameWindow.cpp.s .PHONY : GameWindow.cpp.s # Help Target @@ -158,9 +200,13 @@ help: @echo "... all (the default if no target is provided)" @echo "... clean" @echo "... depend" + @echo "... edit_cache" + @echo "... game" @echo "... rebuild_cache" @echo "... window" - @echo "... edit_cache" + @echo "... Game.o" + @echo "... Game.i" + @echo "... Game.s" @echo "... GameWindow.o" @echo "... GameWindow.i" @echo "... GameWindow.s" diff --git a/src/SplitString/SplitString.cpp b/src/SplitString.cpp similarity index 100% rename from src/SplitString/SplitString.cpp rename to src/SplitString.cpp diff --git a/src/SplitString/SplitString.hpp b/src/SplitString/SplitString.hpp deleted file mode 100644 index e211742..0000000 --- a/src/SplitString/SplitString.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef SPLITSTRING_HPP -#define SPLITSTRING_HPP - -#include -#include -#include -using namespace std; - -/* Purpose: Splits a string into parts where a delimiter is present. - * Inputs: The string to split, and delimiter character. - * Outputs: A vector of the split string. */ -vector SplitString(string str, char delim); - -#endif \ No newline at end of file diff --git a/classes/Game/cmake_install.cmake b/src/cmake_install.cmake similarity index 98% rename from classes/Game/cmake_install.cmake rename to src/cmake_install.cmake index 4fb1f35..8b05030 100644 --- a/classes/Game/cmake_install.cmake +++ b/src/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /home/codio/workspace/Text-Based-Game/classes/Game +# Install script for directory: /home/codio/workspace/Text-Based-Game/src # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) diff --git a/src/hero.cpp b/src/hero.cpp new file mode 100644 index 0000000..c22885e --- /dev/null +++ b/src/hero.cpp @@ -0,0 +1,14 @@ +#include "hero.h" +#include +using namespace std; + +int main() +{ + Hero Knight(2.8, 1.5, 2.2); + Hero Warrior(2.65, 1.8, 2.3); + + //shows 280, hopefully + cout << Knight.heroHP << endl; + return 0; +} + diff --git a/classes/Hero/hero.h b/src/hero.h similarity index 100% rename from classes/Hero/hero.h rename to src/hero.h diff --git a/classes/Hero/ultimate.cpp b/src/ultimate.cpp similarity index 100% rename from classes/Hero/ultimate.cpp rename to src/ultimate.cpp