From ace5c3f3093c50ff7fa6f8b281a377e3788abbd5 Mon Sep 17 00:00:00 2001 From: jacopograndi Date: Sun, 29 Aug 2021 13:57:41 +0200 Subject: adding techs --- CMakeFiles/Makefile2 | 4 +- CMakeFiles/progress.marks | 2 +- CMakeFiles/sdl_test.dir/CXX.includecache | 58 ++++++++------------- CMakeFiles/sdl_test.dir/DependInfo.cmake | 2 + CMakeFiles/sdl_test.dir/build.make | 36 ++++++++++++- CMakeFiles/sdl_test.dir/cmake_clean.cmake | 2 + CMakeFiles/sdl_test.dir/commands/commands.cpp.obj | Bin 74290 -> 74338 bytes CMakeFiles/sdl_test.dir/depend.internal | 23 +++++++- CMakeFiles/sdl_test.dir/depend.make | 23 +++++++- CMakeFiles/sdl_test.dir/game/ground.cpp.obj | Bin 171063 -> 184154 bytes CMakeFiles/sdl_test.dir/game/gst.cpp.obj | Bin 555 -> 162940 bytes CMakeFiles/sdl_test.dir/game/load.cpp.obj | Bin 0 -> 2080546 bytes CMakeFiles/sdl_test.dir/game/menu.cpp.obj | Bin 12516 -> 47831 bytes CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj | Bin 223481 -> 380835 bytes CMakeFiles/sdl_test.dir/game/tech.cpp.obj | Bin 0 -> 555 bytes CMakeFiles/sdl_test.dir/game/view.cpp.obj | Bin 6556 -> 14430 bytes CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj | Bin 31145 -> 87662 bytes CMakeFiles/sdl_test.dir/main.cpp.obj | Bin 1959871 -> 267872 bytes CMakeFiles/sdl_test.dir/objects.a | Bin 2750086 -> 3639720 bytes CMakeFiles/sdl_test.dir/objects1.rsp | 2 +- CMakeFiles/sdl_test.dir/progress.make | 2 + 21 files changed, 111 insertions(+), 43 deletions(-) create mode 100644 CMakeFiles/sdl_test.dir/game/load.cpp.obj create mode 100644 CMakeFiles/sdl_test.dir/game/tech.cpp.obj (limited to 'CMakeFiles') diff --git a/CMakeFiles/Makefile2 b/CMakeFiles/Makefile2 index be5a058..8c45535 100644 --- a/CMakeFiles/Makefile2 +++ b/CMakeFiles/Makefile2 @@ -92,12 +92,12 @@ clean: CMakeFiles/sdl_test.dir/clean CMakeFiles/sdl_test.dir/all: $(MAKE) $(MAKESILENT) -f CMakeFiles\sdl_test.dir\build.make CMakeFiles/sdl_test.dir/depend $(MAKE) $(MAKESILENT) -f CMakeFiles\sdl_test.dir\build.make CMakeFiles/sdl_test.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=C:\Users\jaksk\Desktop\dev\_cpp\age\CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10,11,12 "Built target sdl_test" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=C:\Users\jaksk\Desktop\dev\_cpp\age\CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10,11,12,13,14 "Built target sdl_test" .PHONY : CMakeFiles/sdl_test.dir/all # Build rule for subdir invocation for target. CMakeFiles/sdl_test.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start C:\Users\jaksk\Desktop\dev\_cpp\age\CMakeFiles 12 + $(CMAKE_COMMAND) -E cmake_progress_start C:\Users\jaksk\Desktop\dev\_cpp\age\CMakeFiles 14 $(MAKE) $(MAKESILENT) -f CMakeFiles\Makefile2 CMakeFiles/sdl_test.dir/all $(CMAKE_COMMAND) -E cmake_progress_start C:\Users\jaksk\Desktop\dev\_cpp\age\CMakeFiles 0 .PHONY : CMakeFiles/sdl_test.dir/rule diff --git a/CMakeFiles/progress.marks b/CMakeFiles/progress.marks index 48082f7..8351c19 100644 --- a/CMakeFiles/progress.marks +++ b/CMakeFiles/progress.marks @@ -1 +1 @@ -12 +14 diff --git a/CMakeFiles/sdl_test.dir/CXX.includecache b/CMakeFiles/sdl_test.dir/CXX.includecache index d11e010..60ea70a 100644 --- a/CMakeFiles/sdl_test.dir/CXX.includecache +++ b/CMakeFiles/sdl_test.dir/CXX.includecache @@ -11,6 +11,8 @@ vector - string - +iostream +- ../umath/vec2.h C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h @@ -18,9 +20,23 @@ C:/Users/jaksk/Desktop/dev/_cpp/age/game/ground.h entity.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/entity.h +C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.cpp +gst.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h +iostream +- + +C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h +iostream +- +algorithm +- +string +- vector - +functional +- ground.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/ground.h entity.h @@ -29,40 +45,14 @@ tile.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.h player.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/player.h - -C:/Users/jaksk/Desktop/dev/_cpp/age/game/menu.h -vector -- -string -- -../umath/vec2.h -C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h +tech.h +C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/player.h - -C:/Users/jaksk/Desktop/dev/_cpp/age/game/playercontrol.cpp -iostream -- -string -- -playercontrol.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/playercontrol.h -entity.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/entity.h - -C:/Users/jaksk/Desktop/dev/_cpp/age/game/playercontrol.h -iostream -- -gst.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h -view.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/view.h vector - -functional -- -C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.h +C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h vector - string @@ -70,15 +60,13 @@ string ../umath/vec2.h C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/view.h +C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.h vector - -functional +string - -gst.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h -menu.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/menu.h +../umath/vec2.h +C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h diff --git a/CMakeFiles/sdl_test.dir/DependInfo.cmake b/CMakeFiles/sdl_test.dir/DependInfo.cmake index 341b2c5..35df139 100644 --- a/CMakeFiles/sdl_test.dir/DependInfo.cmake +++ b/CMakeFiles/sdl_test.dir/DependInfo.cmake @@ -8,8 +8,10 @@ set(CMAKE_DEPENDS_CHECK_CXX "C:/Users/jaksk/Desktop/dev/_cpp/age/game/entity.cpp" "C:/Users/jaksk/Desktop/dev/_cpp/age/CMakeFiles/sdl_test.dir/game/entity.cpp.obj" "C:/Users/jaksk/Desktop/dev/_cpp/age/game/ground.cpp" "C:/Users/jaksk/Desktop/dev/_cpp/age/CMakeFiles/sdl_test.dir/game/ground.cpp.obj" "C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.cpp" "C:/Users/jaksk/Desktop/dev/_cpp/age/CMakeFiles/sdl_test.dir/game/gst.cpp.obj" + "C:/Users/jaksk/Desktop/dev/_cpp/age/game/load.cpp" "C:/Users/jaksk/Desktop/dev/_cpp/age/CMakeFiles/sdl_test.dir/game/load.cpp.obj" "C:/Users/jaksk/Desktop/dev/_cpp/age/game/menu.cpp" "C:/Users/jaksk/Desktop/dev/_cpp/age/CMakeFiles/sdl_test.dir/game/menu.cpp.obj" "C:/Users/jaksk/Desktop/dev/_cpp/age/game/playercontrol.cpp" "C:/Users/jaksk/Desktop/dev/_cpp/age/CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj" + "C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.cpp" "C:/Users/jaksk/Desktop/dev/_cpp/age/CMakeFiles/sdl_test.dir/game/tech.cpp.obj" "C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.cpp" "C:/Users/jaksk/Desktop/dev/_cpp/age/CMakeFiles/sdl_test.dir/game/tile.cpp.obj" "C:/Users/jaksk/Desktop/dev/_cpp/age/game/view.cpp" "C:/Users/jaksk/Desktop/dev/_cpp/age/CMakeFiles/sdl_test.dir/game/view.cpp.obj" "C:/Users/jaksk/Desktop/dev/_cpp/age/graphics/graphics.cpp" "C:/Users/jaksk/Desktop/dev/_cpp/age/CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj" diff --git a/CMakeFiles/sdl_test.dir/build.make b/CMakeFiles/sdl_test.dir/build.make index ec9ff16..fae8077 100644 --- a/CMakeFiles/sdl_test.dir/build.make +++ b/CMakeFiles/sdl_test.dir/build.make @@ -229,6 +229,34 @@ CMakeFiles/sdl_test.dir/game/tile.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/sdl_test.dir/game/tile.cpp.s" C:\MinGW64\bin\g++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S C:\Users\jaksk\Desktop\dev\_cpp\age\game\tile.cpp -o CMakeFiles\sdl_test.dir\game\tile.cpp.s +CMakeFiles/sdl_test.dir/game/load.cpp.obj: CMakeFiles/sdl_test.dir/flags.make +CMakeFiles/sdl_test.dir/game/load.cpp.obj: CMakeFiles/sdl_test.dir/includes_CXX.rsp +CMakeFiles/sdl_test.dir/game/load.cpp.obj: game/load.cpp + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=C:\Users\jaksk\Desktop\dev\_cpp\age\CMakeFiles --progress-num=$(CMAKE_PROGRESS_12) "Building CXX object CMakeFiles/sdl_test.dir/game/load.cpp.obj" + C:\MinGW64\bin\g++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles\sdl_test.dir\game\load.cpp.obj -c C:\Users\jaksk\Desktop\dev\_cpp\age\game\load.cpp + +CMakeFiles/sdl_test.dir/game/load.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/sdl_test.dir/game/load.cpp.i" + C:\MinGW64\bin\g++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E C:\Users\jaksk\Desktop\dev\_cpp\age\game\load.cpp > CMakeFiles\sdl_test.dir\game\load.cpp.i + +CMakeFiles/sdl_test.dir/game/load.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/sdl_test.dir/game/load.cpp.s" + C:\MinGW64\bin\g++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S C:\Users\jaksk\Desktop\dev\_cpp\age\game\load.cpp -o CMakeFiles\sdl_test.dir\game\load.cpp.s + +CMakeFiles/sdl_test.dir/game/tech.cpp.obj: CMakeFiles/sdl_test.dir/flags.make +CMakeFiles/sdl_test.dir/game/tech.cpp.obj: CMakeFiles/sdl_test.dir/includes_CXX.rsp +CMakeFiles/sdl_test.dir/game/tech.cpp.obj: game/tech.cpp + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=C:\Users\jaksk\Desktop\dev\_cpp\age\CMakeFiles --progress-num=$(CMAKE_PROGRESS_13) "Building CXX object CMakeFiles/sdl_test.dir/game/tech.cpp.obj" + C:\MinGW64\bin\g++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles\sdl_test.dir\game\tech.cpp.obj -c C:\Users\jaksk\Desktop\dev\_cpp\age\game\tech.cpp + +CMakeFiles/sdl_test.dir/game/tech.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/sdl_test.dir/game/tech.cpp.i" + C:\MinGW64\bin\g++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E C:\Users\jaksk\Desktop\dev\_cpp\age\game\tech.cpp > CMakeFiles\sdl_test.dir\game\tech.cpp.i + +CMakeFiles/sdl_test.dir/game/tech.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/sdl_test.dir/game/tech.cpp.s" + C:\MinGW64\bin\g++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S C:\Users\jaksk\Desktop\dev\_cpp\age\game\tech.cpp -o CMakeFiles\sdl_test.dir\game\tech.cpp.s + # Object files for target sdl_test sdl_test_OBJECTS = \ "CMakeFiles/sdl_test.dir/main.cpp.obj" \ @@ -241,7 +269,9 @@ sdl_test_OBJECTS = \ "CMakeFiles/sdl_test.dir/game/gst.cpp.obj" \ "CMakeFiles/sdl_test.dir/game/view.cpp.obj" \ "CMakeFiles/sdl_test.dir/game/menu.cpp.obj" \ -"CMakeFiles/sdl_test.dir/game/tile.cpp.obj" +"CMakeFiles/sdl_test.dir/game/tile.cpp.obj" \ +"CMakeFiles/sdl_test.dir/game/load.cpp.obj" \ +"CMakeFiles/sdl_test.dir/game/tech.cpp.obj" # External object files for target sdl_test sdl_test_EXTERNAL_OBJECTS = @@ -257,11 +287,13 @@ build/sdl_test.exe: CMakeFiles/sdl_test.dir/game/gst.cpp.obj build/sdl_test.exe: CMakeFiles/sdl_test.dir/game/view.cpp.obj build/sdl_test.exe: CMakeFiles/sdl_test.dir/game/menu.cpp.obj build/sdl_test.exe: CMakeFiles/sdl_test.dir/game/tile.cpp.obj +build/sdl_test.exe: CMakeFiles/sdl_test.dir/game/load.cpp.obj +build/sdl_test.exe: CMakeFiles/sdl_test.dir/game/tech.cpp.obj build/sdl_test.exe: CMakeFiles/sdl_test.dir/build.make build/sdl_test.exe: CMakeFiles/sdl_test.dir/linklibs.rsp build/sdl_test.exe: CMakeFiles/sdl_test.dir/objects1.rsp build/sdl_test.exe: CMakeFiles/sdl_test.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=C:\Users\jaksk\Desktop\dev\_cpp\age\CMakeFiles --progress-num=$(CMAKE_PROGRESS_12) "Linking CXX executable build\sdl_test.exe" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=C:\Users\jaksk\Desktop\dev\_cpp\age\CMakeFiles --progress-num=$(CMAKE_PROGRESS_14) "Linking CXX executable build\sdl_test.exe" $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles\sdl_test.dir\link.txt --verbose=$(VERBOSE) # Rule to build all files generated by this target. diff --git a/CMakeFiles/sdl_test.dir/cmake_clean.cmake b/CMakeFiles/sdl_test.dir/cmake_clean.cmake index 10c76ab..a60d8f5 100644 --- a/CMakeFiles/sdl_test.dir/cmake_clean.cmake +++ b/CMakeFiles/sdl_test.dir/cmake_clean.cmake @@ -3,8 +3,10 @@ file(REMOVE_RECURSE "CMakeFiles/sdl_test.dir/game/entity.cpp.obj" "CMakeFiles/sdl_test.dir/game/ground.cpp.obj" "CMakeFiles/sdl_test.dir/game/gst.cpp.obj" + "CMakeFiles/sdl_test.dir/game/load.cpp.obj" "CMakeFiles/sdl_test.dir/game/menu.cpp.obj" "CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj" + "CMakeFiles/sdl_test.dir/game/tech.cpp.obj" "CMakeFiles/sdl_test.dir/game/tile.cpp.obj" "CMakeFiles/sdl_test.dir/game/view.cpp.obj" "CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj" diff --git a/CMakeFiles/sdl_test.dir/commands/commands.cpp.obj b/CMakeFiles/sdl_test.dir/commands/commands.cpp.obj index 916d4eb..fcc08fe 100644 Binary files a/CMakeFiles/sdl_test.dir/commands/commands.cpp.obj and b/CMakeFiles/sdl_test.dir/commands/commands.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/depend.internal b/CMakeFiles/sdl_test.dir/depend.internal index ba844c9..67a2d8e 100644 --- a/CMakeFiles/sdl_test.dir/depend.internal +++ b/CMakeFiles/sdl_test.dir/depend.internal @@ -60,6 +60,7 @@ CMakeFiles/sdl_test.dir/game/ground.cpp.obj C:/Users/jaksk/Desktop/dev/_cpp/age/game/ground.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/player.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.h C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h CMakeFiles/sdl_test.dir/game/gst.cpp.obj @@ -68,6 +69,18 @@ CMakeFiles/sdl_test.dir/game/gst.cpp.obj C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.cpp C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/player.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.h + C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h +CMakeFiles/sdl_test.dir/game/load.cpp.obj + C:/Users/jaksk/Desktop/dev/_cpp/age/game/entity.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/ground.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/load.cpp + C:/Users/jaksk/Desktop/dev/_cpp/age/game/load.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/nlohmann/json.hpp + C:/Users/jaksk/Desktop/dev/_cpp/age/game/player.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.h C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h CMakeFiles/sdl_test.dir/game/menu.cpp.obj @@ -82,9 +95,14 @@ CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj C:/Users/jaksk/Desktop/dev/_cpp/age/game/player.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/playercontrol.cpp C:/Users/jaksk/Desktop/dev/_cpp/age/game/playercontrol.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/view.h C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h +CMakeFiles/sdl_test.dir/game/tech.cpp.obj + C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.cpp + C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h + C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h CMakeFiles/sdl_test.dir/game/tile.cpp.obj C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.cpp C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.h @@ -95,6 +113,7 @@ CMakeFiles/sdl_test.dir/game/view.cpp.obj C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/menu.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/player.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/view.cpp C:/Users/jaksk/Desktop/dev/_cpp/age/game/view.h @@ -151,6 +170,7 @@ CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/menu.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/player.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/view.h C:/Users/jaksk/Desktop/dev/_cpp/age/graphics/cam.h @@ -208,15 +228,16 @@ CMakeFiles/sdl_test.dir/main.cpp.obj C:/Users/jaksk/Desktop/dev/_cpp/age/game/entity.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/ground.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/load.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/menu.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/player.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/playercontrol.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/view.h C:/Users/jaksk/Desktop/dev/_cpp/age/graphics/cam.h C:/Users/jaksk/Desktop/dev/_cpp/age/graphics/graphics.h C:/Users/jaksk/Desktop/dev/_cpp/age/main.cpp - C:/Users/jaksk/Desktop/dev/_cpp/age/nlohmann/json.hpp C:/Users/jaksk/Desktop/dev/_cpp/age/timing/timing.h C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h CMakeFiles/sdl_test.dir/timing/timing.cpp.obj diff --git a/CMakeFiles/sdl_test.dir/depend.make b/CMakeFiles/sdl_test.dir/depend.make index 0a5b3cd..0a246e4 100644 --- a/CMakeFiles/sdl_test.dir/depend.make +++ b/CMakeFiles/sdl_test.dir/depend.make @@ -59,6 +59,7 @@ CMakeFiles/sdl_test.dir/game/ground.cpp.obj: game/ground.cpp CMakeFiles/sdl_test.dir/game/ground.cpp.obj: game/ground.h CMakeFiles/sdl_test.dir/game/ground.cpp.obj: game/gst.h CMakeFiles/sdl_test.dir/game/ground.cpp.obj: game/player.h +CMakeFiles/sdl_test.dir/game/ground.cpp.obj: game/tech.h CMakeFiles/sdl_test.dir/game/ground.cpp.obj: game/tile.h CMakeFiles/sdl_test.dir/game/ground.cpp.obj: umath/vec2.h @@ -67,9 +68,21 @@ CMakeFiles/sdl_test.dir/game/gst.cpp.obj: game/ground.h CMakeFiles/sdl_test.dir/game/gst.cpp.obj: game/gst.cpp CMakeFiles/sdl_test.dir/game/gst.cpp.obj: game/gst.h CMakeFiles/sdl_test.dir/game/gst.cpp.obj: game/player.h +CMakeFiles/sdl_test.dir/game/gst.cpp.obj: game/tech.h CMakeFiles/sdl_test.dir/game/gst.cpp.obj: game/tile.h CMakeFiles/sdl_test.dir/game/gst.cpp.obj: umath/vec2.h +CMakeFiles/sdl_test.dir/game/load.cpp.obj: game/entity.h +CMakeFiles/sdl_test.dir/game/load.cpp.obj: game/ground.h +CMakeFiles/sdl_test.dir/game/load.cpp.obj: game/gst.h +CMakeFiles/sdl_test.dir/game/load.cpp.obj: game/load.cpp +CMakeFiles/sdl_test.dir/game/load.cpp.obj: game/load.h +CMakeFiles/sdl_test.dir/game/load.cpp.obj: game/nlohmann/json.hpp +CMakeFiles/sdl_test.dir/game/load.cpp.obj: game/player.h +CMakeFiles/sdl_test.dir/game/load.cpp.obj: game/tech.h +CMakeFiles/sdl_test.dir/game/load.cpp.obj: game/tile.h +CMakeFiles/sdl_test.dir/game/load.cpp.obj: umath/vec2.h + CMakeFiles/sdl_test.dir/game/menu.cpp.obj: game/menu.cpp CMakeFiles/sdl_test.dir/game/menu.cpp.obj: game/menu.h CMakeFiles/sdl_test.dir/game/menu.cpp.obj: umath/vec2.h @@ -81,10 +94,15 @@ CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj: game/menu.h CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj: game/player.h CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj: game/playercontrol.cpp CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj: game/playercontrol.h +CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj: game/tech.h CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj: game/tile.h CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj: game/view.h CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj: umath/vec2.h +CMakeFiles/sdl_test.dir/game/tech.cpp.obj: game/tech.cpp +CMakeFiles/sdl_test.dir/game/tech.cpp.obj: game/tech.h +CMakeFiles/sdl_test.dir/game/tech.cpp.obj: umath/vec2.h + CMakeFiles/sdl_test.dir/game/tile.cpp.obj: game/tile.cpp CMakeFiles/sdl_test.dir/game/tile.cpp.obj: game/tile.h CMakeFiles/sdl_test.dir/game/tile.cpp.obj: umath/vec2.h @@ -94,6 +112,7 @@ CMakeFiles/sdl_test.dir/game/view.cpp.obj: game/ground.h CMakeFiles/sdl_test.dir/game/view.cpp.obj: game/gst.h CMakeFiles/sdl_test.dir/game/view.cpp.obj: game/menu.h CMakeFiles/sdl_test.dir/game/view.cpp.obj: game/player.h +CMakeFiles/sdl_test.dir/game/view.cpp.obj: game/tech.h CMakeFiles/sdl_test.dir/game/view.cpp.obj: game/tile.h CMakeFiles/sdl_test.dir/game/view.cpp.obj: game/view.cpp CMakeFiles/sdl_test.dir/game/view.cpp.obj: game/view.h @@ -150,6 +169,7 @@ CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: game/ground.h CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: game/gst.h CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: game/menu.h CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: game/player.h +CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: game/tech.h CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: game/tile.h CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: game/view.h CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: graphics/cam.h @@ -207,15 +227,16 @@ CMakeFiles/sdl_test.dir/main.cpp.obj: commands/commands.h CMakeFiles/sdl_test.dir/main.cpp.obj: game/entity.h CMakeFiles/sdl_test.dir/main.cpp.obj: game/ground.h CMakeFiles/sdl_test.dir/main.cpp.obj: game/gst.h +CMakeFiles/sdl_test.dir/main.cpp.obj: game/load.h CMakeFiles/sdl_test.dir/main.cpp.obj: game/menu.h CMakeFiles/sdl_test.dir/main.cpp.obj: game/player.h CMakeFiles/sdl_test.dir/main.cpp.obj: game/playercontrol.h +CMakeFiles/sdl_test.dir/main.cpp.obj: game/tech.h CMakeFiles/sdl_test.dir/main.cpp.obj: game/tile.h CMakeFiles/sdl_test.dir/main.cpp.obj: game/view.h CMakeFiles/sdl_test.dir/main.cpp.obj: graphics/cam.h CMakeFiles/sdl_test.dir/main.cpp.obj: graphics/graphics.h CMakeFiles/sdl_test.dir/main.cpp.obj: main.cpp -CMakeFiles/sdl_test.dir/main.cpp.obj: nlohmann/json.hpp CMakeFiles/sdl_test.dir/main.cpp.obj: timing/timing.h CMakeFiles/sdl_test.dir/main.cpp.obj: umath/vec2.h diff --git a/CMakeFiles/sdl_test.dir/game/ground.cpp.obj b/CMakeFiles/sdl_test.dir/game/ground.cpp.obj index 6b9339f..a5b97a9 100644 Binary files a/CMakeFiles/sdl_test.dir/game/ground.cpp.obj and b/CMakeFiles/sdl_test.dir/game/ground.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/game/gst.cpp.obj b/CMakeFiles/sdl_test.dir/game/gst.cpp.obj index 919bbaf..befdc3b 100644 Binary files a/CMakeFiles/sdl_test.dir/game/gst.cpp.obj and b/CMakeFiles/sdl_test.dir/game/gst.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/game/load.cpp.obj b/CMakeFiles/sdl_test.dir/game/load.cpp.obj new file mode 100644 index 0000000..70cb174 Binary files /dev/null and b/CMakeFiles/sdl_test.dir/game/load.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/game/menu.cpp.obj b/CMakeFiles/sdl_test.dir/game/menu.cpp.obj index 34fa287..a7eb752 100644 Binary files a/CMakeFiles/sdl_test.dir/game/menu.cpp.obj and b/CMakeFiles/sdl_test.dir/game/menu.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj b/CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj index dee851c..26f4ca2 100644 Binary files a/CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj and b/CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/game/tech.cpp.obj b/CMakeFiles/sdl_test.dir/game/tech.cpp.obj new file mode 100644 index 0000000..dbf13d3 Binary files /dev/null and b/CMakeFiles/sdl_test.dir/game/tech.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/game/view.cpp.obj b/CMakeFiles/sdl_test.dir/game/view.cpp.obj index c929382..b4bb2aa 100644 Binary files a/CMakeFiles/sdl_test.dir/game/view.cpp.obj and b/CMakeFiles/sdl_test.dir/game/view.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj b/CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj index a196959..edc51da 100644 Binary files a/CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj and b/CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/main.cpp.obj b/CMakeFiles/sdl_test.dir/main.cpp.obj index ee8966f..b59be06 100644 Binary files a/CMakeFiles/sdl_test.dir/main.cpp.obj and b/CMakeFiles/sdl_test.dir/main.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/objects.a b/CMakeFiles/sdl_test.dir/objects.a index 80de2a8..9fd1454 100644 Binary files a/CMakeFiles/sdl_test.dir/objects.a and b/CMakeFiles/sdl_test.dir/objects.a differ diff --git a/CMakeFiles/sdl_test.dir/objects1.rsp b/CMakeFiles/sdl_test.dir/objects1.rsp index 72d5bbd..f355c18 100644 --- a/CMakeFiles/sdl_test.dir/objects1.rsp +++ b/CMakeFiles/sdl_test.dir/objects1.rsp @@ -1 +1 @@ -CMakeFiles/sdl_test.dir/main.cpp.obj CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj CMakeFiles/sdl_test.dir/commands/commands.cpp.obj CMakeFiles/sdl_test.dir/timing/timing.cpp.obj CMakeFiles/sdl_test.dir/game/entity.cpp.obj CMakeFiles/sdl_test.dir/game/ground.cpp.obj CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj CMakeFiles/sdl_test.dir/game/gst.cpp.obj CMakeFiles/sdl_test.dir/game/view.cpp.obj CMakeFiles/sdl_test.dir/game/menu.cpp.obj CMakeFiles/sdl_test.dir/game/tile.cpp.obj +CMakeFiles/sdl_test.dir/main.cpp.obj CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj CMakeFiles/sdl_test.dir/commands/commands.cpp.obj CMakeFiles/sdl_test.dir/timing/timing.cpp.obj CMakeFiles/sdl_test.dir/game/entity.cpp.obj CMakeFiles/sdl_test.dir/game/ground.cpp.obj CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj CMakeFiles/sdl_test.dir/game/gst.cpp.obj CMakeFiles/sdl_test.dir/game/view.cpp.obj CMakeFiles/sdl_test.dir/game/menu.cpp.obj CMakeFiles/sdl_test.dir/game/tile.cpp.obj CMakeFiles/sdl_test.dir/game/load.cpp.obj CMakeFiles/sdl_test.dir/game/tech.cpp.obj diff --git a/CMakeFiles/sdl_test.dir/progress.make b/CMakeFiles/sdl_test.dir/progress.make index 5d4d464..4f6e68a 100644 --- a/CMakeFiles/sdl_test.dir/progress.make +++ b/CMakeFiles/sdl_test.dir/progress.make @@ -10,4 +10,6 @@ CMAKE_PROGRESS_9 = 9 CMAKE_PROGRESS_10 = 10 CMAKE_PROGRESS_11 = 11 CMAKE_PROGRESS_12 = 12 +CMAKE_PROGRESS_13 = 13 +CMAKE_PROGRESS_14 = 14 -- cgit v1.2.3-54-g00ecf