diff options
| author | Ray <[email protected]> | 2019-06-05 00:04:31 +0200 |
|---|---|---|
| committer | Ray <[email protected]> | 2019-06-05 00:04:31 +0200 |
| commit | df7a0582160537f3962a6ab46e1dadc034f56458 (patch) | |
| tree | 8931a3fe78179e608483810dbac516e84b81fa4a /projects | |
| parent | 0b7373446d199600db1770374cfa48ec91008dc3 (diff) | |
| download | raylib-df7a0582160537f3962a6ab46e1dadc034f56458.tar.gz raylib-df7a0582160537f3962a6ab46e1dadc034f56458.zip | |
Review projects paths
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/4coder/Makefile | 4 | ||||
| -rw-r--r-- | projects/CodeBlocks/core_basic_window.cbp | 8 | ||||
| -rw-r--r-- | projects/Geany/raylib_compile_execute.bat | 4 | ||||
| -rw-r--r-- | projects/Geany/raylib_compile_sources.bat | 6 | ||||
| -rw-r--r-- | projects/VSCode/.vscode/c_cpp_properties.json | 2 | ||||
| -rw-r--r-- | projects/VSCode/.vscode/launch.json | 4 | ||||
| -rw-r--r-- | projects/VSCode/.vscode/tasks.json | 4 | ||||
| -rw-r--r-- | projects/VSCode/Makefile | 4 |
8 files changed, 18 insertions, 18 deletions
diff --git a/projects/4coder/Makefile b/projects/4coder/Makefile index 63d093a2..a00f4fab 100644 --- a/projects/4coder/Makefile +++ b/projects/4coder/Makefile @@ -27,7 +27,7 @@ PROJECT_NAME ?= game RAYLIB_VERSION ?= 2.5.0 RAYLIB_API_VERSION ?= 2 -RAYLIB_PATH ?= C:\GitHub\raylib +RAYLIB_PATH ?= ..\.. # Define default options @@ -200,7 +200,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) # resource file contains windows executable icon and properties # -Wl,--subsystem,windows hides the console window - CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -Wl,--subsystem,windows + CFLAGS += $(RAYLIB_PATH)/src/raylib.rc.data -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) ifeq ($(RAYLIB_LIBTYPE),STATIC) diff --git a/projects/CodeBlocks/core_basic_window.cbp b/projects/CodeBlocks/core_basic_window.cbp index 0000860f..c4b22a9e 100644 --- a/projects/CodeBlocks/core_basic_window.cbp +++ b/projects/CodeBlocks/core_basic_window.cbp @@ -13,11 +13,11 @@ <Option compiler="gcc" /> <Compiler> <Add option="-g" /> - <Add directory="../../raylib/raylib/release/include" /> + <Add directory="../../src" /> </Compiler> <Linker> <Add option="-lraylib -lopengl32 -lgdi32 -lwinmm" /> - <Add library="../../../../raylib/raylib/release/libs/win32/mingw32/libraylib.a" /> + <Add library="../../src/libraylib.a" /> </Linker> </Target> <Target title="Release"> @@ -27,12 +27,12 @@ <Option compiler="gcc" /> <Compiler> <Add option="-O2" /> - <Add directory="../../../../raylib/raylib/release/include" /> + <Add directory="../../src" /> </Compiler> <Linker> <Add option="-s" /> <Add option="-lraylib -lopengl32 -lgdi32 -lwinmm" /> - <Add library="../../../../raylib/raylib/release/libs/win32/mingw32/libraylib.a" /> + <Add library="../../src/libraylib.a" /> </Linker> </Target> </Build> diff --git a/projects/Geany/raylib_compile_execute.bat b/projects/Geany/raylib_compile_execute.bat index eeba0b05..09783383 100644 --- a/projects/Geany/raylib_compile_execute.bat +++ b/projects/Geany/raylib_compile_execute.bat @@ -2,7 +2,7 @@ :: > Setup required Environment :: ------------------------------------- set RAYLIB_DIR=C:\raylib -set PATH=%PATH%;%RAYLIB_DIR%\mingw32\bin +set PATH=%PATH%;%RAYLIB_DIR%\mingw\bin set FILE_NAME=%1 set NAME_PART=%FILE_NAME:~0,-2% cd %~dp0 @@ -13,7 +13,7 @@ cmd /c if exist %NAME_PART%.exe del /F %NAME_PART%.exe :: . :: > Compiling program :: -------------------------- -gcc -o %NAME_PART%.exe %FILE_NAME% %RAYLIB_DIR%\raylib.rc.data -s -O2 -I../../src -Iexternal -lraylib -lopengl32 -lgdi32 -lwinmm -std=c99 -Wall -mwindows +gcc -o %NAME_PART%.exe %FILE_NAME% %RAYLIB_DIR%\src\raylib.rc.data -s -O2 -I../../src -Iexternal -lraylib -lopengl32 -lgdi32 -lwinmm -std=c99 -Wall -mwindows :: . :: . > Executing program :: ------------------------- diff --git a/projects/Geany/raylib_compile_sources.bat b/projects/Geany/raylib_compile_sources.bat index f0090990..c17ffba9 100644 --- a/projects/Geany/raylib_compile_sources.bat +++ b/projects/Geany/raylib_compile_sources.bat @@ -7,7 +7,7 @@ set GRAPHICS_API=GRAPHICS_API_OPENGL_33 :: > Setup required Environment :: ------------------------------------- set RAYLIB_DIR=C:\raylib -set PATH=%PATH%;%RAYLIB_DIR%\mingw32\bin +set PATH=%PATH%;%RAYLIB_DIR%\mingw\bin cd %RAYLIB_DIR%\raylib\src :: . :: > Cleaning latest build @@ -33,8 +33,8 @@ ar rcs libraylib.a core.o rglfw.o shapes.o textures.o text.o models.o raudio.o u :: . :: > Installing raylib library :: ----------------------------- -cmd /c copy raylib.h %RAYLIB_DIR%\mingw32\i686-w64-mingw32\include /Y -cmd /c copy libraylib.a %RAYLIB_DIR%\mingw32\i686-w64-mingw32\lib /Y +cmd /c copy raylib.h %RAYLIB_DIR%\mingw\i686-w64-mingw32\include /Y +cmd /c copy libraylib.a %RAYLIB_DIR%\mingw\i686-w64-mingw32\lib /Y :: . :: > Restore environment :: ----------------------------- diff --git a/projects/VSCode/.vscode/c_cpp_properties.json b/projects/VSCode/.vscode/c_cpp_properties.json index d4d8e14a..496a9b2d 100644 --- a/projects/VSCode/.vscode/c_cpp_properties.json +++ b/projects/VSCode/.vscode/c_cpp_properties.json @@ -13,7 +13,7 @@ "GRAPHICS_API_OPENGL_33", "PLATFORM_DESKTOP" ], - "compilerPath": "C:/raylib/mingw32/bin/gcc.exe", + "compilerPath": "C:/raylib/mingw/bin/gcc.exe", "cStandard": "c11", "cppStandard": "c++14", "intelliSenseMode": "clang-x64" diff --git a/projects/VSCode/.vscode/launch.json b/projects/VSCode/.vscode/launch.json index be3fa55a..afb54b7f 100644 --- a/projects/VSCode/.vscode/launch.json +++ b/projects/VSCode/.vscode/launch.json @@ -23,7 +23,7 @@ } ], "windows": { - "miDebuggerPath": "C:/raylib/mingw32/bin/gdb.exe", + "miDebuggerPath": "C:/raylib/mingw/bin/gdb.exe", }, "osx": { "MIMode": "lldb" @@ -46,7 +46,7 @@ "MIMode": "gdb", "windows": { "program": "${workspaceFolder}/${fileBasenameNoExtension}.exe", - "miDebuggerPath": "C:/raylib/mingw32/bin/gdb.exe" + "miDebuggerPath": "C:/raylib/mingw/bin/gdb.exe" }, "osx": { "MIMode": "lldb" diff --git a/projects/VSCode/.vscode/tasks.json b/projects/VSCode/.vscode/tasks.json index 0d8be4cf..072fa179 100644 --- a/projects/VSCode/.vscode/tasks.json +++ b/projects/VSCode/.vscode/tasks.json @@ -12,7 +12,7 @@ "DEBUGGING=TRUE" ], "windows": { - "command": "C:/raylib/mingw32/bin/mingw32-make.exe", + "command": "C:/raylib/mingw/bin/mingw32-make.exe", "args": [ "RAYLIB_PATH=C:/raylib/raylib" ], @@ -35,7 +35,7 @@ "PLATFORM=PLATFORM_DESKTOP", ], "windows": { - "command": "C:/raylib/mingw32/bin/mingw32-make.exe", + "command": "C:/raylib/mingw/bin/mingw32-make.exe", "args": [ "RAYLIB_PATH=C:/raylib/raylib", ], diff --git a/projects/VSCode/Makefile b/projects/VSCode/Makefile index 63d093a2..a00f4fab 100644 --- a/projects/VSCode/Makefile +++ b/projects/VSCode/Makefile @@ -27,7 +27,7 @@ PROJECT_NAME ?= game RAYLIB_VERSION ?= 2.5.0 RAYLIB_API_VERSION ?= 2 -RAYLIB_PATH ?= C:\GitHub\raylib +RAYLIB_PATH ?= ..\.. # Define default options @@ -200,7 +200,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) # resource file contains windows executable icon and properties # -Wl,--subsystem,windows hides the console window - CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -Wl,--subsystem,windows + CFLAGS += $(RAYLIB_PATH)/src/raylib.rc.data -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) ifeq ($(RAYLIB_LIBTYPE),STATIC) |
