Reviewed Windows resource file name

2018-05-29 00:52:08 +02:00 · 2018-05-29 00:52:08 +02:00 · d873314c27
commit d873314c27
parent 0148432588
24 changed files with 21 additions and 20 deletions
--- a/.gitignore
+++ b/.gitignore
@ -48,6 +48,7 @@ ipch/
 # Ignore compiled binaries
 *.o
 *.exe
+!src/raylib.rc.o

 # Ignore all examples files
 examples/*
--- 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)
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/projects/Notepad++/npes_saved.txt
+++ b/projects/Notepad++/npes_saved.txt
--- a/release/libs/win32/mingw32/libraylib.a
+++ b/release/libs/win32/mingw32/libraylib.a
--- a/release/libs/win32/tcc/libraylib.a
+++ b/release/libs/win32/tcc/libraylib.a
--- 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)
--- a/src/raylib.rc.o
+++ b/src/raylib.rc.o
--- 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
--- 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
--- 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