Browse Source

Review raylib version to 2.0

Review raylib_icon resource
pull/542/head
Ray 6 years ago
parent
commit
aa76985c0d
10 changed files with 14 additions and 15 deletions
  1. +0
    -1
      .gitignore
  2. +2
    -2
      examples/Makefile
  3. BIN
      release/libs/win32/mingw32/libraylib.a
  4. +1
    -1
      src/CMakeLists.txt
  5. +1
    -1
      src/Makefile
  6. +7
    -7
      src/raylib.rc
  7. BIN
      src/raylib_icon
  8. +1
    -1
      templates/advance_game/Makefile
  9. +1
    -1
      templates/simple_game/Makefile
  10. +1
    -1
      templates/standard_game/Makefile

+ 0
- 1
.gitignore View File

@ -45,7 +45,6 @@ ipch/
# Ignore compiled binaries
*.o
*.exe
!tools/rREM/rrem.exe
# Ignore all examples files
examples/*

+ 2
- 2
examples/Makefile View File

@ -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)

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


+ 1
- 1
src/CMakeLists.txt View File

@ -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

+ 1
- 1
src/Makefile View File

@ -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.

+ 7
- 7
src/raylib.rc View File

@ -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"

BIN
src/resources → src/raylib_icon View File


+ 1
- 1
templates/advance_game/Makefile View File

@ -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

+ 1
- 1
templates/simple_game/Makefile View File

@ -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

+ 1
- 1
templates/standard_game/Makefile View File

@ -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

Loading…
Cancel
Save