Fixed conflicts

2 files changed, 2 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b226ac6..6504d85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,4 +12,4 @@ add_subdirectory(libs/raylib)
 add_executable(raylib_template src/main.c)
 target_link_libraries(raylib_template PRIVATE raylib)
 target_compile_definitions(raylib_template PUBLIC ASSETS_PATH="${CMAKE_CURRENT_SOURCE_DIR}/assets/") # Set the asset path macro to the absolute path on the dev machine
-#target_compile_definitions(raylib_template PUBLIC ASSETS_PATH="relative-path-to-assets-in-the-game-package") # Set the asset path macro in release more
\ No newline at end of file
+#target_compile_definitions(raylib_template PUBLIC ASSETS_PATH="relative-path-to-assets-in-the-game-package") # Set the asset path macro in release more
diff --git a/src/main.c b/src/main.c
index 570fa23..aeaa9df 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3,11 +3,6 @@
 #define SCREEN_WIDTH (800)
 #define SCREEN_HEIGHT (450)
 
-// This is set in the cmake file by default, if you don't use cmake you can set this macro to the path to your asset folder
-#ifndef ASSETS_PATH
-#define ASSETS_PATH "assets/"
-#endif
-
 int main(void)
 {
     InitWindow(SCREEN_WIDTH, SCREEN_HEIGHT, "Window title");
@@ -35,4 +30,4 @@ int main(void)
     CloseWindow();
 
     return 0;
-}
\ No newline at end of file
+}