diff --git a/.gitignore b/.gitignore index 5148772..fc687bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ include lib bin -.idea \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index c019d90..c7ae9d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "vendor/raylib-cpp"] - path = vendor/raylib-cpp + path = depends/raylib-cpp url = https://github.com/robloach/raylib-cpp [submodule "vendor/raylib"] - path = vendor/raylib + path = depends/raylib url = https://github.com/raysan5/raylib diff --git a/Makefile b/Makefile index 7228402..0c47fa4 100644 --- a/Makefile +++ b/Makefile @@ -71,15 +71,15 @@ submodules: # Copy the relevant header files into includes include: submodules $(MKDIR) $(call platformpth, ./include) - $(call COPY,vendor/raylib/src,./include,raylib.h) - $(call COPY,vendor/raylib/src,./include,raymath.h) - $(call COPY,vendor/raylib-cpp/include,./include,*.hpp) + $(call COPY,depends/raylib/src,./include,raylib.h) + $(call COPY,depends/raylib/src,./include,raymath.h) + $(call COPY,depends/raylib-cpp/include,./include,*.hpp) # Build the raylib static library file and copy it into lib lib: submodules - cd vendor/raylib/src $(THEN) "$(MAKE)" PLATFORM=PLATFORM_DESKTOP + cd depends/raylib/src $(THEN) "$(MAKE)" PLATFORM=PLATFORM_DESKTOP $(MKDIR) $(call platformpth, lib/$(platform)) - $(call COPY,vendor/raylib/$(libGenDir),lib/$(platform),libraylib.a) + $(call COPY,depends/raylib/$(libGenDir),lib/$(platform),libraylib.a) # Link the program and create the executable $(target): $(objects) diff --git a/depends/raylib b/depends/raylib new file mode 160000 index 0000000..0851960 --- /dev/null +++ b/depends/raylib @@ -0,0 +1 @@ +Subproject commit 0851960397f02a477d80eda2239f90fae14dec64 diff --git a/depends/raylib-cpp b/depends/raylib-cpp new file mode 160000 index 0000000..a8f803e --- /dev/null +++ b/depends/raylib-cpp @@ -0,0 +1 @@ +Subproject commit a8f803edae6db67dafa1f84c1099f1bbc74925ef