2
0
Эх сурвалжийг харах

Updated some scripts paths

NOTE: New raylib release installer uses `w64devkit`, smaller and more updated than regular `mingw64-w64` default project. Paths are updated properly.
Ray 3 жил өмнө
parent
commit
5e3db0aa83

+ 3 - 3
examples/raylib_compile_execute.bat

@@ -4,9 +4,9 @@
 :: .
 :: .
 :: > Setup required Environment
 :: > Setup required Environment
 :: -------------------------------------
 :: -------------------------------------
-set RAYLIB_INCLUDE_DIR=C:\GitHub\raylib\src
-set RAYLIB_LIB_DIR=C:\GitHub\raylib\src
-set RAYLIB_RES_FILE=C:\GitHub\raylib\raylib.rc.data
+set RAYLIB_INCLUDE_DIR=C:\raylib\src
+set RAYLIB_LIB_DIR=C:\raylib\src
+set RAYLIB_RES_FILE=C:\raylib\src\raylib.rc.data
 set COMPILER_DIR=C:\raylib\mingw\bin
 set COMPILER_DIR=C:\raylib\mingw\bin
 set PATH=%PATH%;%COMPILER_DIR%
 set PATH=%PATH%;%COMPILER_DIR%
 :: Get full filename path for input file %1
 :: Get full filename path for input file %1

+ 3 - 3
examples/raylib_makefile_example.bat

@@ -4,9 +4,9 @@
 :: .
 :: .
 :: > Setup required Environment
 :: > Setup required Environment
 :: -------------------------------------
 :: -------------------------------------
-set RAYLIB_INCLUDE_DIR=C:\GitHub\raylib\src
-set RAYLIB_LIB_DIR=C:\GitHub\raylib\src
-set RAYLIB_RES_FILE=C:\GitHub\raylib\raylib.rc.data
+set RAYLIB_INCLUDE_DIR=C:\raylib\src
+set RAYLIB_LIB_DIR=C:\raylib\src
+set RAYLIB_RES_FILE=C:\raylib\src\raylib.rc.data
 set COMPILER_DIR=C:\raylib\mingw\bin
 set COMPILER_DIR=C:\raylib\mingw\bin
 set PATH=%PATH%;%COMPILER_DIR%
 set PATH=%PATH%;%COMPILER_DIR%
 set FILENAME=%1
 set FILENAME=%1

+ 2 - 1
projects/Geany/raylib_compile_execute.bat

@@ -2,7 +2,8 @@
 :: > Setup required Environment
 :: > Setup required Environment
 :: -------------------------------------
 :: -------------------------------------
 set RAYLIB_DIR=C:\raylib
 set RAYLIB_DIR=C:\raylib
-set PATH=%PATH%;%RAYLIB_DIR%\mingw\bin
+set COMPILER_DIR=C:\raylib\mingw\bin
+set PATH=%PATH%;%COMPILER_DIR%
 set FILE_NAME=%1
 set FILE_NAME=%1
 set NAME_PART=%FILE_NAME:~0,-2%
 set NAME_PART=%FILE_NAME:~0,-2%
 cd %~dp0
 cd %~dp0

+ 3 - 2
projects/Geany/raylib_compile_sources.bat

@@ -7,7 +7,8 @@ set GRAPHICS_API=GRAPHICS_API_OPENGL_33
 :: > Setup required Environment
 :: > Setup required Environment
 :: -------------------------------------
 :: -------------------------------------
 set RAYLIB_DIR=C:\raylib
 set RAYLIB_DIR=C:\raylib
-set PATH=%PATH%;%RAYLIB_DIR%\mingw\bin
+set COMPILER_DIR=C:\raylib\mingw\bin
+set PATH=%PATH%;%COMPILER_DIR%
 cd %RAYLIB_DIR%\raylib\src
 cd %RAYLIB_DIR%\raylib\src
 :: .
 :: .
 :: > Cleaning latest build
 :: > Cleaning latest build
@@ -29,7 +30,7 @@ gcc -O2 -c utils.c -std=c99 -Wall -DPLATFORM_DESKTOP
 :: .
 :: .
 :: . > Generate raylib library
 :: . > Generate raylib library
 :: ------------------------------
 :: ------------------------------
-ar rcs libraylib.a core.o rglfw.o shapes.o textures.o text.o models.o raudio.o utils.o
+ar rcs libraylib.a rcore.o rglfw.o rshapes.o rtextures.o rtext.o rmodels.o raudio.o utils.o
 :: .
 :: .
 :: > Installing raylib library
 :: > Installing raylib library
 :: -----------------------------
 :: -----------------------------

+ 1 - 1
projects/VSCode/.vscode/c_cpp_properties.json

@@ -13,7 +13,7 @@
                 "GRAPHICS_API_OPENGL_33",
                 "GRAPHICS_API_OPENGL_33",
                 "PLATFORM_DESKTOP"
                 "PLATFORM_DESKTOP"
             ],
             ],
-            "compilerPath": "C:/raylib/mingw/bin/gcc.exe",
+            "compilerPath": "C:/raylib/w64devkit/bin/gcc.exe",
             "cStandard": "c99",
             "cStandard": "c99",
             "cppStandard": "c++14",
             "cppStandard": "c++14",
             "intelliSenseMode": "gcc-x64"
             "intelliSenseMode": "gcc-x64"

+ 2 - 2
projects/VSCode/.vscode/launch.json

@@ -23,7 +23,7 @@
               }
               }
             ],
             ],
             "windows": {
             "windows": {
-              "miDebuggerPath": "C:/raylib/mingw/bin/gdb.exe",
+              "miDebuggerPath": "C:/raylib/w64devkit/bin/gdb.exe",
             },
             },
             "osx": {
             "osx": {
               "MIMode": "lldb"
               "MIMode": "lldb"
@@ -46,7 +46,7 @@
             "MIMode": "gdb",
             "MIMode": "gdb",
             "windows": {
             "windows": {
               "program": "${workspaceFolder}/${fileBasenameNoExtension}.exe",
               "program": "${workspaceFolder}/${fileBasenameNoExtension}.exe",
-              "miDebuggerPath": "C:/raylib/mingw/bin/gdb.exe"
+              "miDebuggerPath": "C:/raylib/w64devkit/bin/gdb.exe"
             },
             },
             "osx": {
             "osx": {
               "MIMode": "lldb"
               "MIMode": "lldb"

+ 2 - 2
projects/VSCode/.vscode/tasks.json

@@ -14,7 +14,7 @@
                 "OBJS=${fileBasenameNoExtension}.c"
                 "OBJS=${fileBasenameNoExtension}.c"
             ],
             ],
             "windows": {
             "windows": {
-                "command": "C:/raylib/mingw/bin/mingw32-make.exe",
+                "command": "mingw32-make.exe",
                 "args": [
                 "args": [
                     "RAYLIB_PATH=C:/raylib/raylib",
                     "RAYLIB_PATH=C:/raylib/raylib",
                     "PROJECT_NAME=${fileBasenameNoExtension}",
                     "PROJECT_NAME=${fileBasenameNoExtension}",
@@ -48,7 +48,7 @@
                 "OBJS=${fileBasenameNoExtension}.c"
                 "OBJS=${fileBasenameNoExtension}.c"
             ],
             ],
             "windows": {
             "windows": {
-                "command": "C:/raylib/mingw/bin/mingw32-make.exe",
+                "command": "mingw32-make.exe",
                 "args": [
                 "args": [
                     "RAYLIB_PATH=C:/raylib/raylib",
                     "RAYLIB_PATH=C:/raylib/raylib",
                     "PROJECT_NAME=${fileBasenameNoExtension}",
                     "PROJECT_NAME=${fileBasenameNoExtension}",

+ 2 - 2
projects/VSCode/Makefile

@@ -25,11 +25,11 @@
 
 
 # Define required raylib variables
 # Define required raylib variables
 PROJECT_NAME       ?= game
 PROJECT_NAME       ?= game
-RAYLIB_VERSION     ?= 3.8.0
+RAYLIB_VERSION     ?= 4.0.0
 RAYLIB_PATH        ?= ..\..
 RAYLIB_PATH        ?= ..\..
 
 
 # Define compiler path on Windows
 # Define compiler path on Windows
-COMPILER_PATH      ?= C:/raylib/mingw/bin
+COMPILER_PATH      ?= C:/raylib/w64devkit/bin
 
 
 # Define default options
 # Define default options
 # One of PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
 # One of PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB

+ 1 - 1
src/Makefile

@@ -76,7 +76,7 @@ RAYLIB_MODULE_MODELS ?= TRUE
 RAYLIB_MODULE_RAYGUI ?= FALSE
 RAYLIB_MODULE_RAYGUI ?= FALSE
 RAYLIB_MODULE_PHYSAC ?= FALSE
 RAYLIB_MODULE_PHYSAC ?= FALSE
 
 
-RAYLIB_MODULE_RAYGUI_PATH ?= $(RAYLIB_SRC_PATH)/../../raygui/src
+RAYLIB_MODULE_RAYGUI_PATH ?= $(RAYLIB_SRC_PATH)/extras
 RAYLIB_MODULE_PHYSAC_PATH ?= $(RAYLIB_SRC_PATH)/extras
 RAYLIB_MODULE_PHYSAC_PATH ?= $(RAYLIB_SRC_PATH)/extras
 
 
 # Use external GLFW library instead of rglfw module
 # Use external GLFW library instead of rglfw module