Browse Source

Reviewed Windows resource file name

Ray 7 years ago
parent
commit
d873314c27

+ 1 - 0
.gitignore

@@ -48,6 +48,7 @@ ipch/
 # Ignore compiled binaries
 # Ignore compiled binaries
 *.o
 *.o
 *.exe
 *.exe
+!src/raylib.rc.o
 
 
 # Ignore all examples files
 # Ignore all examples files
 examples/*
 examples/*

+ 2 - 2
examples/Makefile

@@ -205,9 +205,9 @@ CFLAGS += -O1 -s -Wall -std=c99 -D_DEFAULT_SOURCE -Wno-missing-braces
 #CFLAGS += -Wextra -Wmissing-prototypes -Wstrict-prototypes
 #CFLAGS += -Wextra -Wmissing-prototypes -Wstrict-prototypes
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
     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
         # -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
     endif
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
         ifeq ($(RAYLIB_BUILD_MODE),DEBUG)
         ifeq ($(RAYLIB_BUILD_MODE),DEBUG)

+ 1 - 1
examples/others/rlgl_standalone.c

@@ -15,7 +15,7 @@
 *       raymath.h - Vector and matrix math functions
 *       raymath.h - Vector and matrix math functions
 *
 *
 *   Compile example using:
 *   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
 *           -L. -L$(RAYLIB_DIR)\raylib\src -lglfw3 -lopengl32 -lgdi32 -Wall -std=c99
 *
 *
 *   This example has been created using raylib 1.7 (www.raylib.com)
 *   This example has been created using raylib 1.7 (www.raylib.com)

+ 1 - 1
examples/physac/physics_demo.c

@@ -7,7 +7,7 @@
 *
 *
 *   Use the following line to compile:
 *   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
 *   -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition
 *   
 *   
 *   Copyright (c) 2016-2018 Victor Fisac
 *   Copyright (c) 2016-2018 Victor Fisac

+ 1 - 1
examples/physac/physics_friction.c

@@ -7,7 +7,7 @@
 *
 *
 *   Use the following line to compile:
 *   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
 *   -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition
 *   
 *   
 *   Copyright (c) 2016-2018 Victor Fisac
 *   Copyright (c) 2016-2018 Victor Fisac

+ 1 - 1
examples/physac/physics_movement.c

@@ -7,7 +7,7 @@
 *
 *
 *   Use the following line to compile:
 *   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
 *   -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition
 *   
 *   
 *   Copyright (c) 2016-2018 Victor Fisac
 *   Copyright (c) 2016-2018 Victor Fisac

+ 1 - 1
examples/physac/physics_restitution.c

@@ -7,7 +7,7 @@
 *
 *
 *   Use the following line to compile:
 *   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
 *   -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition
 *   
 *   
 *   Copyright (c) 2016-2018 Victor Fisac
 *   Copyright (c) 2016-2018 Victor Fisac

+ 1 - 1
examples/physac/physics_shatter.c

@@ -7,7 +7,7 @@
 *
 *
 *   Use the following line to compile:
 *   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
 *   -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition
 *   
 *   
 *   Copyright (c) 2016-2018 Victor Fisac
 *   Copyright (c) 2016-2018 Victor Fisac

+ 1 - 1
games/Makefile

@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
         # -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
     endif
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -D_DEFAULT_SOURCE
         CFLAGS += -D_DEFAULT_SOURCE

+ 1 - 1
games/drturtle/Makefile

@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
         # -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
     endif
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -D_DEFAULT_SOURCE
         CFLAGS += -D_DEFAULT_SOURCE

+ 1 - 1
games/just_do/Makefile

@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
         # -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
     endif
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -D_DEFAULT_SOURCE
         CFLAGS += -D_DEFAULT_SOURCE

+ 1 - 1
games/koala_seasons/Makefile

@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
         # -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
     endif
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -D_DEFAULT_SOURCE
         CFLAGS += -D_DEFAULT_SOURCE

+ 1 - 1
games/light_my_ritual/Makefile

@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
         # -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
     endif
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -D_DEFAULT_SOURCE
         CFLAGS += -D_DEFAULT_SOURCE

+ 1 - 1
games/skully_escape/Makefile

@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
         # -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
     endif
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -D_DEFAULT_SOURCE
         CFLAGS += -D_DEFAULT_SOURCE

+ 1 - 1
games/transmission/Makefile

@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
         # -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
     endif
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -D_DEFAULT_SOURCE
         CFLAGS += -D_DEFAULT_SOURCE

+ 1 - 1
games/wave_collector/Makefile

@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
         # -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
     endif
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -D_DEFAULT_SOURCE
         CFLAGS += -D_DEFAULT_SOURCE

BIN
projects/Notepad++/npes_saved.txt


BIN
release/libs/win32/mingw32/libraylib.a


BIN
release/libs/win32/tcc/libraylib.a


+ 1 - 1
src/physac.h

@@ -43,7 +43,7 @@
 *   NOTE 2: Physac requires static C library linkage to avoid dependency on MinGW DLL (-static -lpthread)
 *   NOTE 2: Physac requires static C library linkage to avoid dependency on MinGW DLL (-static -lpthread)
 *
 *
 *   Use the following code to compile:
 *   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:
 *   VERY THANKS TO:
 *       Ramon Santamaria (github: @raysan5)
 *       Ramon Santamaria (github: @raysan5)

BIN
src/raylib_icon → src/raylib.rc.o


+ 1 - 1
templates/advance_game/Makefile

@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
         # -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
     endif
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -D_DEFAULT_SOURCE
         CFLAGS += -D_DEFAULT_SOURCE

+ 1 - 1
templates/simple_game/Makefile

@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
         # -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
     endif
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -D_DEFAULT_SOURCE
         CFLAGS += -D_DEFAULT_SOURCE

+ 1 - 1
templates/standard_game/Makefile

@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
         # -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
     endif
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -D_DEFAULT_SOURCE
         CFLAGS += -D_DEFAULT_SOURCE