diff options
Diffstat (limited to 'games')
| -rw-r--r-- | games/Makefile | 27 | ||||
| -rw-r--r-- | games/drturtle/Makefile | 27 | ||||
| -rw-r--r-- | games/just_do/Makefile | 25 | ||||
| -rw-r--r-- | games/koala_seasons/Makefile | 27 | ||||
| -rw-r--r-- | games/light_my_ritual/Makefile | 27 | ||||
| -rw-r--r-- | games/light_my_ritual/screens/screen_gameplay.c | 48 | ||||
| -rw-r--r-- | games/skully_escape/Makefile | 27 | ||||
| -rw-r--r-- | games/transmission/Makefile | 27 | ||||
| -rw-r--r-- | games/wave_collector/Makefile | 25 |
9 files changed, 154 insertions, 106 deletions
diff --git a/games/Makefile b/games/Makefile index c14ff36c..01c0bbe3 100644 --- a/games/Makefile +++ b/games/Makefile @@ -59,7 +59,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) PLATFORM_OS=LINUX endif ifeq ($(UNAMEOS),FreeBSD) - PLATFORM_OS=FREEBSD + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),OpenBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),NetBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),DragonFly) + PLATFORM_OS=BSD endif ifeq ($(UNAMEOS),Darwin) PLATFORM_OS=OSX @@ -97,8 +106,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),OSX) RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/osx endif - ifeq ($(PLATFORM_OS),FREEBSD) - RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/freebsd + ifeq ($(PLATFORM_OS),BSD) + RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/bsd endif endif ifeq ($(PLATFORM),PLATFORM_RPI) @@ -117,8 +126,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # OSX default compiler CC = clang endif - ifeq ($(PLATFORM_OS),FREEBSD) - # FreeBSD default compiler + ifeq ($(PLATFORM_OS),BSD) + # FreeBSD, OpenBSD, NetBSD, DragonFly default compiler CC = clang endif endif @@ -160,7 +169,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) # resources file contains windows exe icon # -Wl,--subsystem,windows hides the console window - CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows + CFLAGS += $(RAYLIB_PATH)/src/raylib.rc.o -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) CFLAGS += -D_DEFAULT_SOURCE @@ -200,7 +209,7 @@ endif LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)/src ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),FREEBSD) + ifeq ($(PLATFORM_OS),BSD) INCLUDE_PATHS += -I/usr/local/include LDFLAGS += -L. -Lsrc -L/usr/local/lib endif @@ -237,8 +246,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # NOTE: Required packages: libopenal-dev libegl1-mesa-dev LDLIBS = -lraylib -framework OpenGL -framework OpenAL -framework Cocoa endif - ifeq ($(PLATFORM_OS),FREEBSD) - # Libraries for FreeBSD desktop compiling + ifeq ($(PLATFORM_OS),BSD) + # Libraries for FreeBSD, OpenBSD, NetBSD, DragonFly desktop compiling # NOTE: Required packages: mesa-libs LDLIBS = -lraylib -lGL -lpthread -lm diff --git a/games/drturtle/Makefile b/games/drturtle/Makefile index 242d0c5c..d200a929 100644 --- a/games/drturtle/Makefile +++ b/games/drturtle/Makefile @@ -59,7 +59,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) PLATFORM_OS=LINUX endif ifeq ($(UNAMEOS),FreeBSD) - PLATFORM_OS=FREEBSD + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),OpenBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),NetBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),DragonFly) + PLATFORM_OS=BSD endif ifeq ($(UNAMEOS),Darwin) PLATFORM_OS=OSX @@ -97,8 +106,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),OSX) RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/osx endif - ifeq ($(PLATFORM_OS),FREEBSD) - RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/freebsd + ifeq ($(PLATFORM_OS),BSD) + RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/bsd endif endif ifeq ($(PLATFORM),PLATFORM_RPI) @@ -117,8 +126,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # OSX default compiler CC = clang endif - ifeq ($(PLATFORM_OS),FREEBSD) - # FreeBSD default compiler + ifeq ($(PLATFORM_OS),BSD) + # FreeBSD, OpenBSD, NetBSD, DragonFly default compiler CC = clang endif endif @@ -160,7 +169,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) # resources file contains windows exe icon # -Wl,--subsystem,windows hides the console window - CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows + CFLAGS += $(RAYLIB_PATH)/src/raylib.rc.o -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) CFLAGS += -D_DEFAULT_SOURCE @@ -200,7 +209,7 @@ endif LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)/src ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),FREEBSD) + ifeq ($(PLATFORM_OS),BSD) INCLUDE_PATHS += -I/usr/local/include LDFLAGS += -L. -Lsrc -L/usr/local/lib endif @@ -237,8 +246,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # NOTE: Required packages: libopenal-dev libegl1-mesa-dev LDLIBS = -lraylib -framework OpenGL -framework OpenAL -framework Cocoa endif - ifeq ($(PLATFORM_OS),FREEBSD) - # Libraries for FreeBSD desktop compiling + ifeq ($(PLATFORM_OS),BSD) + # Libraries for FreeBSD, OpenBSD, NetBSD, DragonFly desktop compiling # NOTE: Required packages: mesa-libs LDLIBS = -lraylib -lGL -lpthread -lm diff --git a/games/just_do/Makefile b/games/just_do/Makefile index d5481e51..9877b7d5 100644 --- a/games/just_do/Makefile +++ b/games/just_do/Makefile @@ -59,7 +59,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) PLATFORM_OS=LINUX endif ifeq ($(UNAMEOS),FreeBSD) - PLATFORM_OS=FREEBSD + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),OpenBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),NetBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),DragonFly) + PLATFORM_OS=BSD endif ifeq ($(UNAMEOS),Darwin) PLATFORM_OS=OSX @@ -97,8 +106,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),OSX) RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/osx endif - ifeq ($(PLATFORM_OS),FREEBSD) - RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/freebsd + ifeq ($(PLATFORM_OS),BSD) + RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/bsd endif endif ifeq ($(PLATFORM),PLATFORM_RPI) @@ -117,8 +126,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # OSX default compiler CC = clang endif - ifeq ($(PLATFORM_OS),FREEBSD) - # FreeBSD default compiler + ifeq ($(PLATFORM_OS),BSD) + # FreeBSD, OpenBSD, NetBSD, DragonFly default compiler CC = clang endif endif @@ -160,7 +169,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) # resources file contains windows exe icon # -Wl,--subsystem,windows hides the console window - CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows + CFLAGS += $(RAYLIB_PATH)/src/raylib.rc.o -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) CFLAGS += -D_DEFAULT_SOURCE @@ -200,7 +209,7 @@ endif LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)/src ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),FREEBSD) + ifeq ($(PLATFORM_OS),BSD) INCLUDE_PATHS += -I/usr/local/include LDFLAGS += -L. -Lsrc -L/usr/local/lib endif @@ -237,7 +246,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # NOTE: Required packages: libopenal-dev libegl1-mesa-dev LDLIBS = -lraylib -framework OpenGL -framework OpenAL -framework Cocoa endif - ifeq ($(PLATFORM_OS),FREEBSD) + ifeq ($(PLATFORM_OS),BSD) # Libraries for FreeBSD desktop compiling # NOTE: Required packages: mesa-libs LDLIBS = -lraylib -lGL -lpthread -lm diff --git a/games/koala_seasons/Makefile b/games/koala_seasons/Makefile index 3dd299fd..d88177fe 100644 --- a/games/koala_seasons/Makefile +++ b/games/koala_seasons/Makefile @@ -59,7 +59,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) PLATFORM_OS=LINUX endif ifeq ($(UNAMEOS),FreeBSD) - PLATFORM_OS=FREEBSD + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),OpenBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),NetBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),DragonFly) + PLATFORM_OS=BSD endif ifeq ($(UNAMEOS),Darwin) PLATFORM_OS=OSX @@ -97,8 +106,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),OSX) RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/osx endif - ifeq ($(PLATFORM_OS),FREEBSD) - RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/freebsd + ifeq ($(PLATFORM_OS),BSD) + RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/bsd endif endif ifeq ($(PLATFORM),PLATFORM_RPI) @@ -117,8 +126,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # OSX default compiler CC = clang endif - ifeq ($(PLATFORM_OS),FREEBSD) - # FreeBSD default compiler + ifeq ($(PLATFORM_OS),BSD) + # FreeBSD, OpenBSD, NetBSD, DragonFly default compiler CC = clang endif endif @@ -160,7 +169,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) # resources file contains windows exe icon # -Wl,--subsystem,windows hides the console window - CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows + CFLAGS += $(RAYLIB_PATH)/src/raylib.rc.o -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) CFLAGS += -D_DEFAULT_SOURCE @@ -200,7 +209,7 @@ endif LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)/src ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),FREEBSD) + ifeq ($(PLATFORM_OS),BSD) INCLUDE_PATHS += -I/usr/local/include LDFLAGS += -L. -Lsrc -L/usr/local/lib endif @@ -237,8 +246,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # NOTE: Required packages: libopenal-dev libegl1-mesa-dev LDLIBS = -lraylib -framework OpenGL -framework OpenAL -framework Cocoa endif - ifeq ($(PLATFORM_OS),FREEBSD) - # Libraries for FreeBSD desktop compiling + ifeq ($(PLATFORM_OS),BSD) + # Libraries for FreeBSD, OpenBSD, NetBSD, DragonFly desktop compiling # NOTE: Required packages: mesa-libs LDLIBS = -lraylib -lGL -lpthread -lm diff --git a/games/light_my_ritual/Makefile b/games/light_my_ritual/Makefile index cdd96129..1eb69d7d 100644 --- a/games/light_my_ritual/Makefile +++ b/games/light_my_ritual/Makefile @@ -59,7 +59,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) PLATFORM_OS=LINUX endif ifeq ($(UNAMEOS),FreeBSD) - PLATFORM_OS=FREEBSD + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),OpenBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),NetBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),DragonFly) + PLATFORM_OS=BSD endif ifeq ($(UNAMEOS),Darwin) PLATFORM_OS=OSX @@ -97,8 +106,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),OSX) RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/osx endif - ifeq ($(PLATFORM_OS),FREEBSD) - RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/freebsd + ifeq ($(PLATFORM_OS),BSD) + RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/bsd endif endif ifeq ($(PLATFORM),PLATFORM_RPI) @@ -117,8 +126,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # OSX default compiler CC = clang endif - ifeq ($(PLATFORM_OS),FREEBSD) - # FreeBSD default compiler + ifeq ($(PLATFORM_OS),BSD) + # FreeBSD, OpenBSD, NetBSD, DragonFly default compiler CC = clang endif endif @@ -160,7 +169,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) # resources file contains windows exe icon # -Wl,--subsystem,windows hides the console window - CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows + CFLAGS += $(RAYLIB_PATH)/src/raylib.rc.o -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) CFLAGS += -D_DEFAULT_SOURCE @@ -200,7 +209,7 @@ endif LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)/src ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),FREEBSD) + ifeq ($(PLATFORM_OS),BSD) INCLUDE_PATHS += -I/usr/local/include LDFLAGS += -L. -Lsrc -L/usr/local/lib endif @@ -237,8 +246,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # NOTE: Required packages: libopenal-dev libegl1-mesa-dev LDLIBS = -lraylib -framework OpenGL -framework OpenAL -framework Cocoa endif - ifeq ($(PLATFORM_OS),FREEBSD) - # Libraries for FreeBSD desktop compiling + ifeq ($(PLATFORM_OS),BSD) + # Libraries for FreeBSD, OpenBSD, NetBSD, DragonFly desktop compiling # NOTE: Required packages: mesa-libs LDLIBS = -lraylib -lGL -lpthread -lm diff --git a/games/light_my_ritual/screens/screen_gameplay.c b/games/light_my_ritual/screens/screen_gameplay.c index 6e3bd1c2..09124402 100644 --- a/games/light_my_ritual/screens/screen_gameplay.c +++ b/games/light_my_ritual/screens/screen_gameplay.c @@ -609,19 +609,11 @@ void DrawGameplayScreen(void) { //if (lightsIII[i].active) DrawCircleV(lightsIII[i].position, lightsIII[i].radius, GOLD); //else DrawCircleLines(lightsIII[i].position.x, lightsIII[i].position.y, lightsIII[i].radius, GRAY); - - if (lightsIII[i].active) - { - DrawTextureRec(texLight, lightsIII[i].frameRec, (Vector2){ lightsIII[i].position.x - 32, lightsIII[i].position.y - 32 }, WHITE); - DrawTexture(lightGlow, lightsIII[i].position.x - lightGlow.width/2, lightsIII[i].position.y - lightGlow.height/2, Fade(WHITE, 0.3f)); - DrawText(FormatText("%02i", lightsIII[i].requiredEnergy), lightsIII[i].position.x - 10, lightsIII[i].position.y + 14, 20, GRAY); - } - else - { - DrawTextureRec(texLight, lightsIII[i].frameRec, (Vector2){ lightsIII[i].position.x - 32, lightsIII[i].position.y - 32 }, WHITE); - DrawText(FormatText("%02i", lightsIII[i].requiredEnergy), lightsIII[i].position.x - 10, lightsIII[i].position.y + 14, 20, YELLOW); - } + DrawTextureRec(texLight, lightsIII[i].frameRec, (Vector2){ lightsIII[i].position.x - 32, lightsIII[i].position.y - 32 }, WHITE); } + + for (int i = 0; i < MAX_LIGHTS_III; i++) if (lightsIII[i].active) DrawTexture(lightGlow, lightsIII[i].position.x - lightGlow.width/2, lightsIII[i].position.y - lightGlow.height/2, Fade(WHITE, 0.3f)); + for (int i = 0; i < MAX_LIGHTS_III; i++) DrawText(FormatText("%02i", lightsIII[i].requiredEnergy), lightsIII[i].position.x - 10, lightsIII[i].position.y + 14, 20, lightsIII[i].active ? GRAY : YELLOW); } case LEVEL_II: { @@ -629,19 +621,11 @@ void DrawGameplayScreen(void) { //if (lightsII[i].active) DrawCircleV(lightsII[i].position, lightsII[i].radius, GOLD); //else DrawCircleLines(lightsI[i].position.x, lightsI[i].position.y, lightsI[i].radius, GRAY); - - if (lightsII[i].active) - { - DrawTextureRec(texLight, lightsII[i].frameRec, (Vector2){ lightsII[i].position.x - 32, lightsII[i].position.y - 32 }, WHITE); - DrawTexture(lightGlow, lightsII[i].position.x - lightGlow.width/2, lightsII[i].position.y - lightGlow.height/2, Fade(WHITE, 0.3f)); - DrawText(FormatText("%02i", lightsII[i].requiredEnergy), lightsII[i].position.x - 10, lightsII[i].position.y + 14, 20, GRAY); - } - else - { - DrawTextureRec(texLight, lightsII[i].frameRec, (Vector2){ lightsII[i].position.x - 32, lightsII[i].position.y - 32 }, WHITE); - DrawText(FormatText("%02i", lightsII[i].requiredEnergy), lightsII[i].position.x - 10, lightsII[i].position.y + 14, 20, YELLOW); - } + DrawTextureRec(texLight, lightsII[i].frameRec, (Vector2){ lightsII[i].position.x - 32, lightsII[i].position.y - 32 }, WHITE); } + + for (int i = 0; i < MAX_LIGHTS_II; i++) if (lightsII[i].active) DrawTexture(lightGlow, lightsII[i].position.x - lightGlow.width/2, lightsII[i].position.y - lightGlow.height/2, Fade(WHITE, 0.3f)); + for (int i = 0; i < MAX_LIGHTS_II; i++) DrawText(FormatText("%02i", lightsII[i].requiredEnergy), lightsII[i].position.x - 10, lightsII[i].position.y + 14, 20, lightsII[i].active ? GRAY : YELLOW); } case LEVEL_I: { @@ -649,19 +633,11 @@ void DrawGameplayScreen(void) { //if (lightsI[i].active) DrawCircleV(lightsI[i].position, lightsI[i].radius, GOLD); //else DrawCircleLines(lightsI[i].position.x, lightsI[i].position.y, lightsI[i].radius, GRAY); - - if (lightsI[i].active) - { - DrawTextureRec(texLight, lightsI[i].frameRec, (Vector2){ lightsI[i].position.x - 32, lightsI[i].position.y - 32 }, WHITE); - DrawTexture(lightGlow, lightsI[i].position.x - lightGlow.width/2, lightsI[i].position.y - lightGlow.height/2, Fade(WHITE, 0.3f)); - DrawText(FormatText("%02i", lightsI[i].requiredEnergy), lightsI[i].position.x - 10, lightsI[i].position.y + 14, 20, GRAY); - } - else - { - DrawTextureRec(texLight, lightsI[i].frameRec, (Vector2){ lightsI[i].position.x - 32, lightsI[i].position.y - 32 }, WHITE); - DrawText(FormatText("%02i", lightsI[i].requiredEnergy), lightsI[i].position.x - 10, lightsI[i].position.y + 14, 20, YELLOW); - } + DrawTextureRec(texLight, lightsI[i].frameRec, (Vector2){ lightsI[i].position.x - 32, lightsI[i].position.y - 32 }, WHITE); } + + for (int i = 0; i < MAX_LIGHTS_I; i++) if (lightsI[i].active) DrawTexture(lightGlow, lightsI[i].position.x - lightGlow.width/2, lightsI[i].position.y - lightGlow.height/2, Fade(WHITE, 0.3f)); + for (int i = 0; i < MAX_LIGHTS_I; i++) DrawText(FormatText("%02i", lightsI[i].requiredEnergy), lightsI[i].position.x - 10, lightsI[i].position.y + 14, 20, lightsI[i].active ? GRAY : YELLOW); } default: break; } diff --git a/games/skully_escape/Makefile b/games/skully_escape/Makefile index 74521e7b..924aad3d 100644 --- a/games/skully_escape/Makefile +++ b/games/skully_escape/Makefile @@ -59,7 +59,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) PLATFORM_OS=LINUX endif ifeq ($(UNAMEOS),FreeBSD) - PLATFORM_OS=FREEBSD + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),OpenBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),NetBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),DragonFly) + PLATFORM_OS=BSD endif ifeq ($(UNAMEOS),Darwin) PLATFORM_OS=OSX @@ -97,8 +106,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),OSX) RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/osx endif - ifeq ($(PLATFORM_OS),FREEBSD) - RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/freebsd + ifeq ($(PLATFORM_OS),BSD) + RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/bsd endif endif ifeq ($(PLATFORM),PLATFORM_RPI) @@ -117,8 +126,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # OSX default compiler CC = clang endif - ifeq ($(PLATFORM_OS),FREEBSD) - # FreeBSD default compiler + ifeq ($(PLATFORM_OS),BSD) + # FreeBSD, OpenBSD, NetBSD, DragonFly default compiler CC = clang endif endif @@ -160,7 +169,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) # resources file contains windows exe icon # -Wl,--subsystem,windows hides the console window - CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows + CFLAGS += $(RAYLIB_PATH)/src/raylib.rc.o -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) CFLAGS += -D_DEFAULT_SOURCE @@ -200,7 +209,7 @@ endif LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)/src ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),FREEBSD) + ifeq ($(PLATFORM_OS),BSD) INCLUDE_PATHS += -I/usr/local/include LDFLAGS += -L. -Lsrc -L/usr/local/lib endif @@ -237,8 +246,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # NOTE: Required packages: libopenal-dev libegl1-mesa-dev LDLIBS = -lraylib -framework OpenGL -framework OpenAL -framework Cocoa endif - ifeq ($(PLATFORM_OS),FREEBSD) - # Libraries for FreeBSD desktop compiling + ifeq ($(PLATFORM_OS),BSD) + # Libraries for FreeBSD, OpenBSD, NetBSD, DragonFly desktop compiling # NOTE: Required packages: mesa-libs LDLIBS = -lraylib -lGL -lpthread -lm diff --git a/games/transmission/Makefile b/games/transmission/Makefile index 2ba9afd9..34e50864 100644 --- a/games/transmission/Makefile +++ b/games/transmission/Makefile @@ -59,7 +59,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) PLATFORM_OS=LINUX endif ifeq ($(UNAMEOS),FreeBSD) - PLATFORM_OS=FREEBSD + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),OpenBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),NetBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),DragonFly) + PLATFORM_OS=BSD endif ifeq ($(UNAMEOS),Darwin) PLATFORM_OS=OSX @@ -97,8 +106,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),OSX) RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/osx endif - ifeq ($(PLATFORM_OS),FREEBSD) - RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/freebsd + ifeq ($(PLATFORM_OS),BSD) + RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/bsd endif endif ifeq ($(PLATFORM),PLATFORM_RPI) @@ -117,8 +126,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # OSX default compiler CC = clang endif - ifeq ($(PLATFORM_OS),FREEBSD) - # FreeBSD default compiler + ifeq ($(PLATFORM_OS),BSD) + # FreeBSD, OpenBSD, NetBSD, DragonFly default compiler CC = clang endif endif @@ -160,7 +169,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) # resources file contains windows exe icon # -Wl,--subsystem,windows hides the console window - CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows + CFLAGS += $(RAYLIB_PATH)/src/raylib.rc.o -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) CFLAGS += -D_DEFAULT_SOURCE @@ -200,7 +209,7 @@ endif LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)/src ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),FREEBSD) + ifeq ($(PLATFORM_OS),BSD) INCLUDE_PATHS += -I/usr/local/include LDFLAGS += -L. -Lsrc -L/usr/local/lib endif @@ -237,8 +246,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # NOTE: Required packages: libopenal-dev libegl1-mesa-dev LDLIBS = -lraylib -framework OpenGL -framework OpenAL -framework Cocoa endif - ifeq ($(PLATFORM_OS),FREEBSD) - # Libraries for FreeBSD desktop compiling + ifeq ($(PLATFORM_OS),BSD) + # Libraries for FreeBSD, OpenBSD, NetBSD, DragonFly desktop compiling # NOTE: Required packages: mesa-libs LDLIBS = -lraylib -lGL -lpthread -lm diff --git a/games/wave_collector/Makefile b/games/wave_collector/Makefile index 9f03e62e..d7ef1a35 100644 --- a/games/wave_collector/Makefile +++ b/games/wave_collector/Makefile @@ -59,7 +59,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) PLATFORM_OS=LINUX endif ifeq ($(UNAMEOS),FreeBSD) - PLATFORM_OS=FREEBSD + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),OpenBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),NetBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),DragonFly) + PLATFORM_OS=BSD endif ifeq ($(UNAMEOS),Darwin) PLATFORM_OS=OSX @@ -97,8 +106,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),OSX) RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/osx endif - ifeq ($(PLATFORM_OS),FREEBSD) - RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/freebsd + ifeq ($(PLATFORM_OS),BSD) + RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/bsd endif endif ifeq ($(PLATFORM),PLATFORM_RPI) @@ -117,8 +126,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # OSX default compiler CC = clang endif - ifeq ($(PLATFORM_OS),FREEBSD) - # FreeBSD default compiler + ifeq ($(PLATFORM_OS),BSD) + # FreeBSD, OpenBSD, NetBSD, DragonFly default compiler CC = clang endif endif @@ -160,7 +169,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) # resources file contains windows exe icon # -Wl,--subsystem,windows hides the console window - CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows + CFLAGS += $(RAYLIB_PATH)/src/raylib.rc.o -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) CFLAGS += -D_DEFAULT_SOURCE @@ -200,7 +209,7 @@ endif LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)/src ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),FREEBSD) + ifeq ($(PLATFORM_OS),BSD) INCLUDE_PATHS += -I/usr/local/include LDFLAGS += -L. -Lsrc -L/usr/local/lib endif @@ -237,7 +246,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # NOTE: Required packages: libopenal-dev libegl1-mesa-dev LDLIBS = -lraylib -framework OpenGL -framework OpenAL -framework Cocoa endif - ifeq ($(PLATFORM_OS),FREEBSD) + ifeq ($(PLATFORM_OS),BSD) # Libraries for FreeBSD desktop compiling # NOTE: Required packages: mesa-libs LDLIBS = -lraylib -lGL -lpthread -lm |
