From f58173649b5ca0d9176d4546190b05838fe3a005 Mon Sep 17 00:00:00 2001 From: williamistGitHub Date: Fri, 18 Oct 2024 17:05:31 -0400 Subject: [PATCH 1/4] fix cmake building --- ScuffedMinecraft/CMakeLists.txt | 4 ++++ ScuffedMinecraft/src/CMakeLists.txt | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ScuffedMinecraft/CMakeLists.txt b/ScuffedMinecraft/CMakeLists.txt index 716b07e..5984286 100644 --- a/ScuffedMinecraft/CMakeLists.txt +++ b/ScuffedMinecraft/CMakeLists.txt @@ -18,5 +18,9 @@ add_custom_target(copy_assets ALL set(CMAKE_EXPORT_COMPILE_COMMANDS ON) +# global dependency directories +include_directories(../Dependencies/include/) +link_directories(../Dependencies/lib/) + add_subdirectory(vendor/imgui) add_subdirectory(src) diff --git a/ScuffedMinecraft/src/CMakeLists.txt b/ScuffedMinecraft/src/CMakeLists.txt index 605e595..8a9aaff 100644 --- a/ScuffedMinecraft/src/CMakeLists.txt +++ b/ScuffedMinecraft/src/CMakeLists.txt @@ -4,6 +4,4 @@ add_executable(scuffed_mc Camera.cpp Planet.cpp WorldGen.cpp ../vendor/glad.c ) -include_directories(../../Dependencies/include/) - -target_link_libraries(scuffed_mc imgui glfw) +target_link_libraries(scuffed_mc imgui glfw3) -- 2.45.2 From 34ba20188f57b2e5232c83532d907456c8cd7b2e Mon Sep 17 00:00:00 2001 From: williamistGitHub Date: Fri, 18 Oct 2024 17:19:44 -0400 Subject: [PATCH 2/4] fix running from vs --- ScuffedMinecraft/src/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ScuffedMinecraft/src/CMakeLists.txt b/ScuffedMinecraft/src/CMakeLists.txt index 8a9aaff..7f1e66e 100644 --- a/ScuffedMinecraft/src/CMakeLists.txt +++ b/ScuffedMinecraft/src/CMakeLists.txt @@ -2,6 +2,9 @@ add_executable(scuffed_mc Application.cpp Chunk.cpp Shader.cpp Block.cpp NoiseSettings.cpp SurfaceFeature.cpp Camera.cpp Planet.cpp WorldGen.cpp ../vendor/glad.c -) +) + +# make sure the program runs in the right place from visual studio +set_target_properties(scuffed_mc PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/bin") target_link_libraries(scuffed_mc imgui glfw3) -- 2.45.2 From 6c3f2ddd84fb8dc2ef9920b5f0424029ba51ca1e Mon Sep 17 00:00:00 2001 From: williamistGitHub Date: Fri, 18 Oct 2024 18:17:23 -0400 Subject: [PATCH 3/4] fix linking glfw on linux --- ScuffedMinecraft/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ScuffedMinecraft/src/CMakeLists.txt b/ScuffedMinecraft/src/CMakeLists.txt index 7f1e66e..0c4a1d8 100644 --- a/ScuffedMinecraft/src/CMakeLists.txt +++ b/ScuffedMinecraft/src/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable(scuffed_mc # make sure the program runs in the right place from visual studio set_target_properties(scuffed_mc PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/bin") -target_link_libraries(scuffed_mc imgui glfw3) +target_link_libraries(scuffed_mc imgui $,glfw3,glfw>) \ No newline at end of file -- 2.45.2 From 734030edcb6de727dd6cfe263d96dd180a505687 Mon Sep 17 00:00:00 2001 From: williamistGitHub Date: Fri, 18 Oct 2024 18:24:58 -0400 Subject: [PATCH 4/4] fix weird gcc thing (i dont even know) --- ScuffedMinecraft/src/Planet.cpp | 2 ++ ScuffedMinecraft/src/Planet.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ScuffedMinecraft/src/Planet.cpp b/ScuffedMinecraft/src/Planet.cpp index 8d1eb87..d251d90 100644 --- a/ScuffedMinecraft/src/Planet.cpp +++ b/ScuffedMinecraft/src/Planet.cpp @@ -6,6 +6,8 @@ Planet* Planet::planet = nullptr; +const unsigned int Planet::chunkSize = 32; + // Public Planet::Planet(Shader* solidShader, Shader* waterShader, Shader* billboardShader) : solidShader(solidShader), waterShader(waterShader), billboardShader(billboardShader) diff --git a/ScuffedMinecraft/src/Planet.h b/ScuffedMinecraft/src/Planet.h index ad39d0a..93daad5 100644 --- a/ScuffedMinecraft/src/Planet.h +++ b/ScuffedMinecraft/src/Planet.h @@ -25,7 +25,7 @@ public: public: static Planet* planet; unsigned int numChunks = 0, numChunksRendered = 0; - static const unsigned int chunkSize = 32; + static const unsigned int chunkSize; private: std::unordered_map, Chunk> chunks; -- 2.45.2