diff --git a/.gitignore b/.gitignore index 124b125bc..12fcf1f01 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,7 @@ ipch/ # Ignore compiled binaries *.o *.exe +!src/raylib.rc.o # Ignore all examples files examples/* diff --git a/examples/Makefile b/examples/Makefile index 64cec3d17..2e9d458ff 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -205,9 +205,9 @@ CFLAGS += -O1 -s -Wall -std=c99 -D_DEFAULT_SOURCE -Wno-missing-braces #CFLAGS += -Wextra -Wmissing-prototypes -Wstrict-prototypes ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) - # resources file contains windows exe icon + # resource file contains windows executable icon and properties # -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) ifeq ($(RAYLIB_BUILD_MODE),DEBUG) diff --git a/examples/others/rlgl_standalone.c b/examples/others/rlgl_standalone.c index d8c128be0..e173702ba 100644 --- a/examples/others/rlgl_standalone.c +++ b/examples/others/rlgl_standalone.c @@ -15,7 +15,7 @@ * raymath.h - Vector and matrix math functions * * Compile example using: -* gcc -o rlgl_standalone.exe rlgl_standalone.c rlgl.o -s $(RAYLIB_DIR)\raylib\raylib_icon -I$(RAYLIB_DIR)\raylib\src / +* gcc -o rlgl_standalone.exe rlgl_standalone.c rlgl.o -s $(RAYLIB_DIR)\raylib\raylib.rc.o -I$(RAYLIB_DIR)\raylib\src / * -L. -L$(RAYLIB_DIR)\raylib\src -lglfw3 -lopengl32 -lgdi32 -Wall -std=c99 * * This example has been created using raylib 1.7 (www.raylib.com) diff --git a/examples/physac/physics_demo.c b/examples/physac/physics_demo.c index d66d2fbec..273b99314 100644 --- a/examples/physac/physics_demo.c +++ b/examples/physac/physics_demo.c @@ -7,7 +7,7 @@ * * Use the following line to compile: * -* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib_icon -static -lraylib -lpthread +* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib.rc.o -static -lraylib -lpthread * -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition * * Copyright (c) 2016-2018 Victor Fisac diff --git a/examples/physac/physics_friction.c b/examples/physac/physics_friction.c index 4c81e8c8b..b4cc571d4 100644 --- a/examples/physac/physics_friction.c +++ b/examples/physac/physics_friction.c @@ -7,7 +7,7 @@ * * Use the following line to compile: * -* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib_icon -static -lraylib -lpthread +* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib.rc.o -static -lraylib -lpthread * -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition * * Copyright (c) 2016-2018 Victor Fisac diff --git a/examples/physac/physics_movement.c b/examples/physac/physics_movement.c index f828c0544..3ca696717 100644 --- a/examples/physac/physics_movement.c +++ b/examples/physac/physics_movement.c @@ -7,7 +7,7 @@ * * Use the following line to compile: * -* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib_icon -static -lraylib -lpthread +* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib.rc.o -static -lraylib -lpthread * -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition * * Copyright (c) 2016-2018 Victor Fisac diff --git a/examples/physac/physics_restitution.c b/examples/physac/physics_restitution.c index 93939ebb6..8e26c93f8 100644 --- a/examples/physac/physics_restitution.c +++ b/examples/physac/physics_restitution.c @@ -7,7 +7,7 @@ * * Use the following line to compile: * -* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib_icon -static -lraylib -lpthread +* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib.rc.o -static -lraylib -lpthread * -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition * * Copyright (c) 2016-2018 Victor Fisac diff --git a/examples/physac/physics_shatter.c b/examples/physac/physics_shatter.c index 8102e1624..e34d6cec0 100644 --- a/examples/physac/physics_shatter.c +++ b/examples/physac/physics_shatter.c @@ -7,7 +7,7 @@ * * Use the following line to compile: * -* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib_icon -static -lraylib -lpthread +* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib.rc.o -static -lraylib -lpthread * -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition * * Copyright (c) 2016-2018 Victor Fisac diff --git a/games/Makefile b/games/Makefile index c14ff36c7..9d83f8f5b 100644 --- a/games/Makefile +++ b/games/Makefile @@ -160,7 +160,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 diff --git a/games/drturtle/Makefile b/games/drturtle/Makefile index 242d0c5c1..e30a53a38 100644 --- a/games/drturtle/Makefile +++ b/games/drturtle/Makefile @@ -160,7 +160,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 diff --git a/games/just_do/Makefile b/games/just_do/Makefile index d5481e51e..217e6622d 100644 --- a/games/just_do/Makefile +++ b/games/just_do/Makefile @@ -160,7 +160,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 diff --git a/games/koala_seasons/Makefile b/games/koala_seasons/Makefile index 3dd299fd9..89d534631 100644 --- a/games/koala_seasons/Makefile +++ b/games/koala_seasons/Makefile @@ -160,7 +160,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 diff --git a/games/light_my_ritual/Makefile b/games/light_my_ritual/Makefile index cdd961293..b89b861ed 100644 --- a/games/light_my_ritual/Makefile +++ b/games/light_my_ritual/Makefile @@ -160,7 +160,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 diff --git a/games/skully_escape/Makefile b/games/skully_escape/Makefile index 74521e7b8..61789787c 100644 --- a/games/skully_escape/Makefile +++ b/games/skully_escape/Makefile @@ -160,7 +160,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 diff --git a/games/transmission/Makefile b/games/transmission/Makefile index 2ba9afd9c..ef9b06e46 100644 --- a/games/transmission/Makefile +++ b/games/transmission/Makefile @@ -160,7 +160,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 diff --git a/games/wave_collector/Makefile b/games/wave_collector/Makefile index 9f03e62e0..dfa219c34 100644 --- a/games/wave_collector/Makefile +++ b/games/wave_collector/Makefile @@ -160,7 +160,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 diff --git a/projects/Notepad++/npes_saved.txt b/projects/Notepad++/npes_saved.txt index 89cca10cc..fd62b75d4 100644 Binary files a/projects/Notepad++/npes_saved.txt and b/projects/Notepad++/npes_saved.txt differ diff --git a/release/libs/win32/mingw32/libraylib.a b/release/libs/win32/mingw32/libraylib.a index 3aac1c0cb..940dc3537 100644 Binary files a/release/libs/win32/mingw32/libraylib.a and b/release/libs/win32/mingw32/libraylib.a differ diff --git a/release/libs/win32/tcc/libraylib.a b/release/libs/win32/tcc/libraylib.a new file mode 100644 index 000000000..94114ac0a Binary files /dev/null and b/release/libs/win32/tcc/libraylib.a differ diff --git a/src/physac.h b/src/physac.h index 7fa625451..6b78fcc62 100644 --- a/src/physac.h +++ b/src/physac.h @@ -43,7 +43,7 @@ * NOTE 2: Physac requires static C library linkage to avoid dependency on MinGW DLL (-static -lpthread) * * Use the following code to compile: -* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib_icon -static -lraylib -lpthread -lopengl32 -lgdi32 -std=c99 +* gcc -o $(NAME_PART).exe $(FILE_NAME) -s -static -lraylib -lpthread -lopengl32 -lgdi32 -std=c99 * * VERY THANKS TO: * Ramon Santamaria (github: @raysan5) diff --git a/src/raylib_icon b/src/raylib.rc.o similarity index 99% rename from src/raylib_icon rename to src/raylib.rc.o index f6e32f371..28005c734 100644 Binary files a/src/raylib_icon and b/src/raylib.rc.o differ diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile index 61a59bc2a..298180417 100644 --- a/templates/advance_game/Makefile +++ b/templates/advance_game/Makefile @@ -160,7 +160,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 diff --git a/templates/simple_game/Makefile b/templates/simple_game/Makefile index 1b5126706..feab47ba4 100644 --- a/templates/simple_game/Makefile +++ b/templates/simple_game/Makefile @@ -160,7 +160,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 diff --git a/templates/standard_game/Makefile b/templates/standard_game/Makefile index 7046233ca..55fabde5a 100644 --- a/templates/standard_game/Makefile +++ b/templates/standard_game/Makefile @@ -160,7 +160,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