summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRay <[email protected]>2018-11-19 15:18:11 +0100
committerRay <[email protected]>2018-11-19 15:18:11 +0100
commitac23af9bf0215614aed84efec2872d78203ca10a (patch)
tree426e2278e514b95242580d94ee4c0e114735db8b
parented269b8d9a96afb2af69a218eb1f2e7fe8fcc8a6 (diff)
downloadraylib-ac23af9bf0215614aed84efec2872d78203ca10a.tar.gz
raylib-ac23af9bf0215614aed84efec2872d78203ca10a.zip
Review resources naming
raylib resource data file for Windows platform (containing raylib icon and metadata for executable file) has been renamed to a more consistent name: raylib.rc.data Also required to work with tcc compiler.
-rw-r--r--examples/Makefile2
-rw-r--r--examples/physac/physics_demo.c5
-rw-r--r--examples/physac/physics_friction.c5
-rw-r--r--examples/physac/physics_movement.c5
-rw-r--r--examples/physac/physics_restitution.c5
-rw-r--r--examples/physac/physics_shatter.c5
-rw-r--r--games/Makefile2
-rw-r--r--games/drturtle/Makefile2
-rw-r--r--games/just_do/Makefile2
-rw-r--r--games/koala_seasons/Makefile2
-rw-r--r--games/light_my_ritual/Makefile2
-rw-r--r--games/skully_escape/Makefile2
-rw-r--r--games/transmission/Makefile2
-rw-r--r--games/wave_collector/Makefile2
-rw-r--r--projects/Notepad++/npes_saved_mingw.txtbin7724 -> 7730 bytes
-rw-r--r--projects/Notepad++/npes_saved_tcc.txtbin7650 -> 7656 bytes
-rw-r--r--projects/VSCode/Makefile2
-rw-r--r--raylib.rc.data (renamed from raylib.rc.o)bin11190 -> 11190 bytes
-rw-r--r--src/core.c2
-rw-r--r--templates/advance_game/Makefile2
-rw-r--r--templates/simple_game/Makefile2
-rw-r--r--templates/standard_game/Makefile2
22 files changed, 29 insertions, 24 deletions
diff --git a/examples/Makefile b/examples/Makefile
index a26e0bbb..8dd46ad3 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -216,7 +216,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
ifeq ($(PLATFORM_OS),WINDOWS)
# resource file contains windows executable icon and properties
# -Wl,--subsystem,windows hides the console window
- CFLAGS += $(RAYLIB_PATH)/raylib.rc.o -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -Wl,--subsystem,windows
endif
ifeq ($(PLATFORM_OS),LINUX)
ifeq ($(RAYLIB_BUILD_MODE),DEBUG)
diff --git a/examples/physac/physics_demo.c b/examples/physac/physics_demo.c
index d417efec..a92bb9e1 100644
--- a/examples/physac/physics_demo.c
+++ b/examples/physac/physics_demo.c
@@ -7,8 +7,9 @@
*
* Use the following line to compile:
*
-* 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
+* gcc -o $(NAME_PART).exe $(FILE_NAME) -s -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 99491eeb..337a1265 100644
--- a/examples/physac/physics_friction.c
+++ b/examples/physac/physics_friction.c
@@ -7,8 +7,9 @@
*
* Use the following line to compile:
*
-* 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
+* gcc -o $(NAME_PART).exe $(FILE_NAME) -s -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 4c4f259f..e799eaad 100644
--- a/examples/physac/physics_movement.c
+++ b/examples/physac/physics_movement.c
@@ -7,8 +7,9 @@
*
* Use the following line to compile:
*
-* 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
+* gcc -o $(NAME_PART).exe $(FILE_NAME) -s -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 197e6eb5..3231d0cf 100644
--- a/examples/physac/physics_restitution.c
+++ b/examples/physac/physics_restitution.c
@@ -7,8 +7,9 @@
*
* Use the following line to compile:
*
-* 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
+* gcc -o $(NAME_PART).exe $(FILE_NAME) -s -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 17f9bfc2..74785227 100644
--- a/examples/physac/physics_shatter.c
+++ b/examples/physac/physics_shatter.c
@@ -7,8 +7,9 @@
*
* Use the following line to compile:
*
-* 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
+* gcc -o $(NAME_PART).exe $(FILE_NAME) -s -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 ab41665b..5d60f15d 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -169,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)/raylib.rc.o -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -Wl,--subsystem,windows
endif
ifeq ($(PLATFORM_OS),LINUX)
CFLAGS += -D_DEFAULT_SOURCE
diff --git a/games/drturtle/Makefile b/games/drturtle/Makefile
index 45a04ec4..8f1934b5 100644
--- a/games/drturtle/Makefile
+++ b/games/drturtle/Makefile
@@ -169,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)/raylib.rc.o -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -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 464c6345..b6c935f6 100644
--- a/games/just_do/Makefile
+++ b/games/just_do/Makefile
@@ -169,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)/raylib.rc.o -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -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 b0a8d4ee..8482bf2d 100644
--- a/games/koala_seasons/Makefile
+++ b/games/koala_seasons/Makefile
@@ -169,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)/raylib.rc.o -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -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 838207b7..fbc34aac 100644
--- a/games/light_my_ritual/Makefile
+++ b/games/light_my_ritual/Makefile
@@ -169,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)/raylib.rc.o -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -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 58a9b557..8875ad52 100644
--- a/games/skully_escape/Makefile
+++ b/games/skully_escape/Makefile
@@ -169,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)/raylib.rc.o -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -Wl,--subsystem,windows
endif
ifeq ($(PLATFORM_OS),LINUX)
CFLAGS += -D_DEFAULT_SOURCE
diff --git a/games/transmission/Makefile b/games/transmission/Makefile
index 51533eac..a1b7e764 100644
--- a/games/transmission/Makefile
+++ b/games/transmission/Makefile
@@ -169,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)/raylib.rc.o -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -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 c7215848..06e74799 100644
--- a/games/wave_collector/Makefile
+++ b/games/wave_collector/Makefile
@@ -169,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)/raylib.rc.o -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -Wl,--subsystem,windows
endif
ifeq ($(PLATFORM_OS),LINUX)
CFLAGS += -D_DEFAULT_SOURCE
diff --git a/projects/Notepad++/npes_saved_mingw.txt b/projects/Notepad++/npes_saved_mingw.txt
index 0c349c25..7ed0662d 100644
--- a/projects/Notepad++/npes_saved_mingw.txt
+++ b/projects/Notepad++/npes_saved_mingw.txt
Binary files differ
diff --git a/projects/Notepad++/npes_saved_tcc.txt b/projects/Notepad++/npes_saved_tcc.txt
index 7be483ef..d3c4fb0e 100644
--- a/projects/Notepad++/npes_saved_tcc.txt
+++ b/projects/Notepad++/npes_saved_tcc.txt
Binary files differ
diff --git a/projects/VSCode/Makefile b/projects/VSCode/Makefile
index 83e26053..6653b576 100644
--- a/projects/VSCode/Makefile
+++ b/projects/VSCode/Makefile
@@ -179,7 +179,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
# resources file contains windows exe icon
# -Wl,--subsystem,windows hides the console window
CFLAGS += -Wl,--subsystem,windows
- LDFLAGS += $(RAYLIB_PATH)/raylib.rc.o
+ LDFLAGS += $(RAYLIB_PATH)/raylib.rc.data
endif
ifeq ($(PLATFORM_OS),LINUX)
CFLAGS += -D_DEFAULT_SOURCE
diff --git a/raylib.rc.o b/raylib.rc.data
index fa27177d..fa27177d 100644
--- a/raylib.rc.o
+++ b/raylib.rc.data
Binary files differ
diff --git a/src/core.c b/src/core.c
index 35646aa1..14bf6622 100644
--- a/src/core.c
+++ b/src/core.c
@@ -128,7 +128,7 @@
#include <ctype.h> // Required for: tolower() [Used in IsFileExtension()]
#include <sys/stat.h> // Required for stat() [Used in GetLastWriteTime()]
-#if defined(PLATFORM_DESKTOP) && defined(_WIN32) && defined(_MSC_VER)
+#if defined(PLATFORM_DESKTOP) && defined(_WIN32) && (defined(_MSC_VER) || defined(__TINYC__))
#include "external/dirent.h" // Required for: DIR, opendir(), closedir() [Used in GetDirectoryFiles()]
#else
#include <dirent.h> // Required for: DIR, opendir(), closedir() [Used in GetDirectoryFiles()]
diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile
index e1e089cb..33567932 100644
--- a/templates/advance_game/Makefile
+++ b/templates/advance_game/Makefile
@@ -169,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)/raylib.rc.o -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -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 e82aa752..86e0dbde 100644
--- a/templates/simple_game/Makefile
+++ b/templates/simple_game/Makefile
@@ -169,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)/raylib.rc.o -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -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 d707f7f4..b9c6c188 100644
--- a/templates/standard_game/Makefile
+++ b/templates/standard_game/Makefile
@@ -169,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)/raylib.rc.o -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/raylib.rc.data -Wl,--subsystem,windows
endif
ifeq ($(PLATFORM_OS),LINUX)
CFLAGS += -D_DEFAULT_SOURCE