summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--examples/Makefile4
-rw-r--r--release/libs/win32/mingw32/libraylib.abin1218614 -> 1100766 bytes
-rwxr-xr-xsrc/CMakeLists.txt2
-rw-r--r--src/Makefile2
-rw-r--r--src/raylib.rc14
-rw-r--r--src/raylib_icon (renamed from src/resources)bin107260 -> 107340 bytes
-rw-r--r--templates/advance_game/Makefile2
-rw-r--r--templates/simple_game/Makefile2
-rw-r--r--templates/standard_game/Makefile2
10 files changed, 14 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index 1b4d5e41..6caeaead 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ ipch/
# Ignore compiled binaries
*.o
*.exe
-!tools/rREM/rrem.exe
# Ignore all examples files
examples/*
diff --git a/examples/Makefile b/examples/Makefile
index becb91dc..d283e807 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -25,7 +25,7 @@
# Define required raylib variables
PROJECT_NAME ?= raylib_examples
-RAYLIB_VERSION ?= 1.9.7
+RAYLIB_VERSION ?= 2.0.0
RAYLIB_API_VERSION ?= 1
RAYLIB_PATH ?= ..
@@ -207,7 +207,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/resources -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows
endif
ifeq ($(PLATFORM_OS),LINUX)
ifeq ($(RAYLIB_BUILD_MODE),DEBUG)
diff --git a/release/libs/win32/mingw32/libraylib.a b/release/libs/win32/mingw32/libraylib.a
index b188e329..3aac1c0c 100644
--- a/release/libs/win32/mingw32/libraylib.a
+++ b/release/libs/win32/mingw32/libraylib.a
Binary files differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 98b6b0e9..e6501dc5 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@
project(raylib)
include(GNUInstallDirs)
-set(PROJECT_VERSION 1.9.7)
+set(PROJECT_VERSION 2.0.0)
set(API_VERSION 1)
set(RAYLIB raylib) # Name of the generated library
diff --git a/src/Makefile b/src/Makefile
index 8444ed57..67d7c8c2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -42,7 +42,7 @@
.PHONY: all clean install uninstall
# Define required raylib variables
-RAYLIB_VERSION = 1.9.7
+RAYLIB_VERSION = 2.0.0
RAYLIB_API_VERSION = 1
# See below for alternatives.
diff --git a/src/raylib.rc b/src/raylib.rc
index 89eb8e34..ee2a5fab 100644
--- a/src/raylib.rc
+++ b/src/raylib.rc
@@ -1,22 +1,22 @@
GLFW_ICON ICON "raylib.ico"
1 VERSIONINFO
-FILEVERSION 1,8,0,0
-PRODUCTVERSION 1,8,0,0
+FILEVERSION 2,0,0,0
+PRODUCTVERSION 2,0,0,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
//BLOCK "080904E4" // English UK
BLOCK "040904E4" // English US
BEGIN
- //VALUE "CompanyName", "My Company Name"
+ VALUE "CompanyName", "raylib technologies"
VALUE "FileDescription", "Created using raylib (www.raylib.com)"
- VALUE "FileVersion", "1.8.0"
- VALUE "InternalName", "raylib"
- VALUE "LegalCopyright", "(c) 2017 Ramon Santamaria - @raysan5"
+ VALUE "FileVersion", "2.0.0"
+ VALUE "InternalName", "raylib app"
+ VALUE "LegalCopyright", "(c) 2018 Ramon Santamaria - @raysan5"
//VALUE "OriginalFilename", "raylib_app.exe"
VALUE "ProductName", "raylib game"
- VALUE "ProductVersion", "1.8.0"
+ VALUE "ProductVersion", "2.0.0"
END
END
BLOCK "VarFileInfo"
diff --git a/src/resources b/src/raylib_icon
index ca725042..f6e32f37 100644
--- a/src/resources
+++ b/src/raylib_icon
Binary files differ
diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile
index a363e606..181f9dfb 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/resources -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows
endif
ifeq ($(PLATFORM_OS),LINUX)
CFLAGS += -no-pie -D_DEFAULT_SOURCE
diff --git a/templates/simple_game/Makefile b/templates/simple_game/Makefile
index 0de3082b..4cd435ea 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/resources -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows
endif
ifeq ($(PLATFORM_OS),LINUX)
CFLAGS += -no-pie -D_DEFAULT_SOURCE
diff --git a/templates/standard_game/Makefile b/templates/standard_game/Makefile
index 4ca1edd4..e18703b2 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/resources -Wl,--subsystem,windows
+ CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows
endif
ifeq ($(PLATFORM_OS),LINUX)
CFLAGS += -no-pie -D_DEFAULT_SOURCE