Review projects paths
This commit is contained in:
parent
0b7373446d
commit
df7a058216
@ -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)
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
:: -------------------------
|
||||
|
@ -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
|
||||
:: -----------------------------
|
||||
|
@ -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"
|
||||
|
4
projects/VSCode/.vscode/launch.json
vendored
4
projects/VSCode/.vscode/launch.json
vendored
@ -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"
|
||||
|
4
projects/VSCode/.vscode/tasks.json
vendored
4
projects/VSCode/.vscode/tasks.json
vendored
@ -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",
|
||||
],
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user