Просмотр исходного кода

Review raylib version to 2.0

Review raylib_icon resource
pull/542/head
Ray 7 лет назад
Родитель
Сommit
aa76985c0d
10 измененных файлов: 14 добавлений и 15 удалений
  1. +0
    -1
      .gitignore
  2. +2
    -2
      examples/Makefile
  3. Двоичные данные
      release/libs/win32/mingw32/libraylib.a
  4. +1
    -1
      src/CMakeLists.txt
  5. +1
    -1
      src/Makefile
  6. +7
    -7
      src/raylib.rc
  7. Двоичные данные
      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 Просмотреть файл

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

+ 2
- 2
examples/Makefile Просмотреть файл

@ -25,7 +25,7 @@
# Define required raylib variables # Define required raylib variables
PROJECT_NAME ?= raylib_examples PROJECT_NAME ?= raylib_examples
RAYLIB_VERSION ?= 1.9.7
RAYLIB_VERSION ?= 2.0.0
RAYLIB_API_VERSION ?= 1 RAYLIB_API_VERSION ?= 1
RAYLIB_PATH ?= .. RAYLIB_PATH ?= ..
@ -207,7 +207,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/resources -Wl,--subsystem,windows
CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows
endif endif
ifeq ($(PLATFORM_OS),LINUX) ifeq ($(PLATFORM_OS),LINUX)
ifeq ($(RAYLIB_BUILD_MODE),DEBUG) ifeq ($(RAYLIB_BUILD_MODE),DEBUG)

Двоичные данные
release/libs/win32/mingw32/libraylib.a Просмотреть файл


+ 1
- 1
src/CMakeLists.txt Просмотреть файл

@ -2,7 +2,7 @@
project(raylib) project(raylib)
include(GNUInstallDirs) include(GNUInstallDirs)
set(PROJECT_VERSION 1.9.7)
set(PROJECT_VERSION 2.0.0)
set(API_VERSION 1) set(API_VERSION 1)
set(RAYLIB raylib) # Name of the generated library set(RAYLIB raylib) # Name of the generated library

+ 1
- 1
src/Makefile Просмотреть файл

@ -42,7 +42,7 @@
.PHONY: all clean install uninstall .PHONY: all clean install uninstall
# Define required raylib variables # Define required raylib variables
RAYLIB_VERSION = 1.9.7
RAYLIB_VERSION = 2.0.0
RAYLIB_API_VERSION = 1 RAYLIB_API_VERSION = 1
# See below for alternatives. # See below for alternatives.

+ 7
- 7
src/raylib.rc Просмотреть файл

@ -1,22 +1,22 @@
GLFW_ICON ICON "raylib.ico" GLFW_ICON ICON "raylib.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 1,8,0,0
PRODUCTVERSION 1,8,0,0
FILEVERSION 2,0,0,0
PRODUCTVERSION 2,0,0,0
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
//BLOCK "080904E4" // English UK //BLOCK "080904E4" // English UK
BLOCK "040904E4" // English US BLOCK "040904E4" // English US
BEGIN BEGIN
//VALUE "CompanyName", "My Company Name"
VALUE "CompanyName", "raylib technologies"
VALUE "FileDescription", "Created using raylib (www.raylib.com)" 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 "OriginalFilename", "raylib_app.exe"
VALUE "ProductName", "raylib game" VALUE "ProductName", "raylib game"
VALUE "ProductVersion", "1.8.0"
VALUE "ProductVersion", "2.0.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

Двоичные данные
src/resources → src/raylib_icon Просмотреть файл


+ 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/resources -Wl,--subsystem,windows
CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows
endif endif
ifeq ($(PLATFORM_OS),LINUX) ifeq ($(PLATFORM_OS),LINUX)
CFLAGS += -no-pie -D_DEFAULT_SOURCE CFLAGS += -no-pie -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/resources -Wl,--subsystem,windows
CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows
endif endif
ifeq ($(PLATFORM_OS),LINUX) ifeq ($(PLATFORM_OS),LINUX)
CFLAGS += -no-pie -D_DEFAULT_SOURCE CFLAGS += -no-pie -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/resources -Wl,--subsystem,windows
CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows
endif endif
ifeq ($(PLATFORM_OS),LINUX) ifeq ($(PLATFORM_OS),LINUX)
CFLAGS += -no-pie -D_DEFAULT_SOURCE CFLAGS += -no-pie -D_DEFAULT_SOURCE

Загрузка…
Отмена
Сохранить