Răsfoiți Sursa

WARNING: REMOVED `raygui` from `raylib/src/extras`

Ray 3 ani în urmă
părinte
comite
609d92003b

+ 1 - 1
.github/workflows/linux.yml

@@ -87,7 +87,7 @@ jobs:
         cp -v ./src/raylib.h ./build/${{ env.RELEASE_NAME }}/include
         cp -v ./src/raymath.h ./build/${{ env.RELEASE_NAME }}/include
         cp -v ./src/rlgl.h ./build/${{ env.RELEASE_NAME }}/include
-        cp -v ./src/extras/raygui.h ./build/${{ env.RELEASE_NAME }}/include
+        cp -v ./CHANGELOG ./build/${{ env.RELEASE_NAME }}/CHANGELOG
         cp -v ./README.md ./build/${{ env.RELEASE_NAME }}/README.md
         cp -v ./LICENSE ./build/${{ env.RELEASE_NAME }}/LICENSE
         cd build

+ 1 - 1
.github/workflows/macos.yml

@@ -72,7 +72,7 @@ jobs:
         cp -v ./src/raylib.h ./build/${{ env.RELEASE_NAME }}/include
         cp -v ./src/raymath.h ./build/${{ env.RELEASE_NAME }}/include
         cp -v ./src/rlgl.h ./build/${{ env.RELEASE_NAME }}/include
-        cp -v ./src/extras/raygui.h ./build/${{ env.RELEASE_NAME }}/include
+        cp -v ./CHANGELOG ./build/${{ env.RELEASE_NAME }}/CHANGELOG
         cp -v ./README.md ./build/${{ env.RELEASE_NAME }}/README.md
         cp -v ./LICENSE ./build/${{ env.RELEASE_NAME }}/LICENSE
         cd build

+ 1 - 1
.github/workflows/webassembly.yml

@@ -60,7 +60,7 @@ jobs:
         copy /Y .\src\raylib.h .\build\${{ env.RELEASE_NAME }}\include\raylib.h
         copy /Y .\src\raymath.h .\build\${{ env.RELEASE_NAME }}\include\raymath.h
         copy /Y .\src\rlgl.h .\build\${{ env.RELEASE_NAME }}\include\rlgl.h
-        copy /Y .\src\extras\raygui.h .\build\${{ env.RELEASE_NAME }}\include\raygui.h
+        copy /Y .\CHANGELOG .\build/${{ env.RELEASE_NAME }}\CHANGELOG
         copy /Y .\README.md .\build\${{ env.RELEASE_NAME }}\README.md
         copy /Y .\LICENSE .\build\${{ env.RELEASE_NAME }}\LICENSE
         cd build

+ 1 - 1
.github/workflows/windows.yml

@@ -109,7 +109,7 @@ jobs:
         copy /Y .\src\raylib.h .\build\${{ env.RELEASE_NAME }}\include\raylib.h
         copy /Y .\src\raymath.h .\build\${{ env.RELEASE_NAME }}\include\raymath.h
         copy /Y .\src\rlgl.h .\build\${{ env.RELEASE_NAME }}\include\rlgl.h
-        copy /Y .\src\extras\raygui.h .\build\${{ env.RELEASE_NAME }}\include\raygui.h
+        copy /Y .\CHANGELOG .\build\${{ env.RELEASE_NAME }}\CHANGELOG
         copy /Y .\README.md .\build\${{ env.RELEASE_NAME }}\README.md
         copy /Y .\LICENSE .\build\${{ env.RELEASE_NAME }}\LICENSE
         cd build

+ 1 - 3
examples/Makefile

@@ -226,7 +226,7 @@ ifeq ($(PLATFORM),PLATFORM_DRM)
 endif
 
 # Define include paths for required headers: INCLUDE_PATHS
-# NOTE: Some external/extras libraries could be required (stb, physac, easings...)
+# NOTE: Some external/extras libraries could be required (stb, easings...)
 #------------------------------------------------------------------------------------------------
 INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external -I$(RAYLIB_PATH)/src/extras
 
@@ -306,8 +306,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         # Libraries for Windows desktop compilation
         # NOTE: WinMM library required to set high-res timer resolution
         LDLIBS = -lraylib -lopengl32 -lgdi32 -lwinmm
-        # Required for physac examples
-        LDLIBS += -static -lpthread
     endif
     ifeq ($(PLATFORM_OS),LINUX)
         # Libraries for Debian GNU/Linux desktop compiling

+ 0 - 1
examples/build.zig

@@ -93,7 +93,6 @@ pub fn build(b: *std.build.Builder) !void {
     all.dependOn(try add_module("core", b, target));
     all.dependOn(try add_module("models", b, target));
     all.dependOn(try add_module("others", b, target));
-    all.dependOn(try add_module("physics", b, target));
     all.dependOn(try add_module("shaders", b, target));
     all.dependOn(try add_module("shapes", b, target));
     all.dependOn(try add_module("text", b, target));

Fișier diff suprimat deoarece este prea mare
+ 640 - 634
examples/shapes/raygui.h


+ 1 - 1
examples/shapes/shapes_draw_circle_sector.c

@@ -14,7 +14,7 @@
 #include <raylib.h>
 
 #define RAYGUI_IMPLEMENTATION
-#include "extras/raygui.h"                 // Required for GUI controls
+#include "raygui.h"                 // Required for GUI controls
 
 int main(void)
 {

+ 1 - 1
examples/shapes/shapes_draw_rectangle_rounded.c

@@ -14,7 +14,7 @@
 #include <raylib.h>
 
 #define RAYGUI_IMPLEMENTATION
-#include "extras/raygui.h"                 // Required for GUI controls
+#include "raygui.h"                 // Required for GUI controls
 
 int main(void)
 {

+ 1 - 1
examples/shapes/shapes_draw_ring.c

@@ -14,7 +14,7 @@
 #include <raylib.h>
 
 #define RAYGUI_IMPLEMENTATION
-#include "extras/raygui.h"                 // Required for GUI controls
+#include "raygui.h"                 // Required for GUI controls
 
 int main(void)
 {

+ 3 - 3
parser/Makefile

@@ -18,11 +18,11 @@ all:
 parse:
 	./raylib_parser -i ../src/raylib.h -o raylib_api.$(EXTENSION) -f $(FORMAT) -d RLAPI
 	./raylib_parser -i ../src/raymath.h -o raymath_api.$(EXTENSION) -f $(FORMAT) -d RMAPI
+	./raylib_parser -i ../src/rlgl.h -o rlgl_api.$(EXTENSION) -f $(FORMAT) -d RLAPI -t "RLGL IMPLEMENTATION"
 	./raylib_parser -i ../src/extras/easings.h -o easings_api.$(EXTENSION) -f $(FORMAT) -d EASEDEF
-	./raylib_parser -i ../src/extras/physac.h -o physac_api.$(EXTENSION) -f $(FORMAT) -d PHYSACDEF -t "PHYSAC IMPLEMENTATION"
-	./raylib_parser -i ../src/extras/raygui.h -o raygui_api.$(EXTENSION) -f $(FORMAT) -d RAYGUIAPI -t "RAYGUI IMPLEMENTATION"
 	./raylib_parser -i ../src/extras/rmem.h -o rmem_api.$(EXTENSION) -f $(FORMAT) -d RMEMAPI -t "RMEM IMPLEMENTATION"
-	./raylib_parser -i ../src/rlgl.h -o rlgl_api.$(EXTENSION) -f $(FORMAT) -d RLAPI -t "RLGL IMPLEMENTATION"
+	./raylib_parser -i ../physac.h -o physac_api.$(EXTENSION) -f $(FORMAT) -d PHYSACDEF -t "PHYSAC IMPLEMENTATION"
+	./raylib_parser -i ../raygui.h -o raygui_api.$(EXTENSION) -f $(FORMAT) -d RAYGUIAPI -t "RAYGUI IMPLEMENTATION"
 
 clean:
 	rm -f raylib_parser *.json *.txt *.xml *.lua

+ 5 - 2
src/Makefile

@@ -81,8 +81,11 @@ RAYLIB_MODULE_MODELS ?= TRUE
 RAYLIB_MODULE_RAYGUI ?= FALSE
 RAYLIB_MODULE_PHYSAC ?= FALSE
 
-RAYLIB_MODULE_RAYGUI_PATH ?= $(RAYLIB_SRC_PATH)/extras
-RAYLIB_MODULE_PHYSAC_PATH ?= $(RAYLIB_SRC_PATH)/extras
+# NOTE: Additional libraries have been moved to their own repos:
+# raygui: https://github.com/raysan5/raygui
+# physac: https://github.com/raysan5/physac
+RAYLIB_MODULE_RAYGUI_PATH ?= $(RAYLIB_SRC_PATH)/../../raygui/src
+RAYLIB_MODULE_PHYSAC_PATH ?= $(RAYLIB_SRC_PATH)/../../physac/src
 
 # Use external GLFW library instead of rglfw module
 USE_EXTERNAL_GLFW     ?= FALSE

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff