This commit is contained in:
Attila Uygun 2023-08-12 23:04:58 +02:00
parent 1b6352b775
commit 7c148d7555
5 changed files with 15 additions and 8 deletions

View File

@ -54,7 +54,7 @@ toolchain("gcc") {
} }
if (is_apple) { if (is_apple) {
not_needed([ "ar" ]) # libtool is used instead. not_needed([ "ar" ]) # libtool is used instead.
} }
tool("alink") { tool("alink") {

View File

@ -62,9 +62,7 @@ source_set("engine") {
libs = [] libs = []
if (target_os == "linux" || target_os == "win") { if (target_os == "linux" || target_os == "win") {
sources += [ sources += [ "platform/asset_file_generic.cc" ]
"platform/asset_file_generic.cc",
]
} }
if (target_os == "linux") { if (target_os == "linux") {

View File

@ -2,21 +2,29 @@
#define ENGINE_RENDERER_OPENGL_OPENGL_H #define ENGINE_RENDERER_OPENGL_OPENGL_H
#if defined(__ANDROID__) #if defined(__ANDROID__)
// Use the modified Khronos header from ndk-helper. This gives access to // Use the modified Khronos header from ndk-helper. This gives access to
// additional functionality the drivers may expose but which the system headers // additional functionality the drivers may expose but which the system headers
// do not. // do not.
#include "third_party/android/gl3stub.h" #include "third_party/android/gl3stub.h"
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#elif defined(__linux__) #elif defined(__linux__)
#include "third_party/glew/glew.h" #include "third_party/glew/glew.h"
#include "third_party/glew/glxew.h" #include "third_party/glew/glxew.h"
#elif defined(_WIN32) #elif defined(_WIN32)
#define GLEW_STATIC #define GLEW_STATIC
#include "third_party/glew/glew.h" #include "third_party/glew/glew.h"
#include "third_party/glew/wglew.h" #include "third_party/glew/wglew.h"
#endif #endif
#if defined(__linux__) || defined(_WIN32) #if defined(__linux__) || defined(_WIN32)
// Define the missing format for the etc1 // Define the missing format for the etc1
#ifndef GL_ETC1_RGB8_OES #ifndef GL_ETC1_RGB8_OES
#define GL_ETC1_RGB8_OES 0x8D64 #define GL_ETC1_RGB8_OES 0x8D64

View File

@ -1,7 +1,5 @@
executable("hello_world") { executable("hello_world") {
sources = [ sources = [ "hello_world.cc" ]
"hello_world.cc",
]
deps = [ deps = [
"//src/base", "//src/base",

View File

@ -79,7 +79,10 @@ source_set("third_party") {
"volk/volk.c", "volk/volk.c",
] ]
defines = [ "VMA_STATIC_VULKAN_FUNCTIONS=1", "GLEW_STATIC" ] defines = [
"VMA_STATIC_VULKAN_FUNCTIONS=1",
"GLEW_STATIC",
]
if (target_os == "linux" || target_os == "win") { if (target_os == "linux" || target_os == "win") {
sources += [ sources += [