diff options
| author | Ray <[email protected]> | 2018-05-29 00:52:08 +0200 |
|---|---|---|
| committer | Ray <[email protected]> | 2018-05-29 00:52:08 +0200 |
| commit | d873314c279be1582e28f3c90416c6b225b787fb (patch) | |
| tree | 4200c017795330c6e59d33ae67ece9a4f3bf5385 | |
| parent | 0148432588b1ead0676a7aa6fecba2d10c315153 (diff) | |
| download | raylib-d873314c279be1582e28f3c90416c6b225b787fb.tar.gz raylib-d873314c279be1582e28f3c90416c6b225b787fb.zip | |
Reviewed Windows resource file name
24 files changed, 21 insertions, 20 deletions
@@ -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 64cec3d1..2e9d458f 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 d8c128be..e173702b 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 d66d2fbe..273b9931 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 4c81e8c8..b4cc571d 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 f828c054..3ca69671 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 93939ebb..8e26c93f 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 8102e162..e34d6cec 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 c14ff36c..9d83f8f5 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 242d0c5c..e30a53a3 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 d5481e51..217e6622 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 3dd299fd..89d53463 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 cdd96129..b89b861e 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 74521e7b..61789787 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 2ba9afd9..ef9b06e4 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 9f03e62e..dfa219c3 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 Binary files differindex 89cca10c..fd62b75d 100644 --- a/projects/Notepad++/npes_saved.txt +++ b/projects/Notepad++/npes_saved.txt diff --git a/release/libs/win32/mingw32/libraylib.a b/release/libs/win32/mingw32/libraylib.a Binary files differindex 3aac1c0c..940dc353 100644 --- a/release/libs/win32/mingw32/libraylib.a +++ b/release/libs/win32/mingw32/libraylib.a diff --git a/release/libs/win32/tcc/libraylib.a b/release/libs/win32/tcc/libraylib.a Binary files differnew file mode 100644 index 00000000..94114ac0 --- /dev/null +++ b/release/libs/win32/tcc/libraylib.a diff --git a/src/physac.h b/src/physac.h index 7fa62545..6b78fcc6 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 Binary files differindex f6e32f37..28005c73 100644 --- a/src/raylib_icon +++ b/src/raylib.rc.o diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile index 61a59bc2..29818041 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 1b512670..feab47ba 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 7046233c..55fabde5 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 |