ouczbs/idk_me
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix project xmake

Browse Source
This commit is contained in:
ouczbs 2024-05-09 11:29:40 +08:00
parent 074876173c
commit d1068d5b97
8 changed files with 5369 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ src/engine/wrapper/
src/engine/scripts/
x64/
src/engine/idk/phys/PhysicsSystemNoMT.cpp
*.log

3
src/3rdparty/xmake.lua vendored
View File

@ -2,4 +2,5 @@
add_requires("gtest")
add_requires("vulkansdk","spirv-tools")
add_requires("glfw")
add_requires("assimp","freetype","glad","glslang","spirv-cross","stb")
add_requires("glslang 1.3.211")
add_requires("assimp","freetype","glad","spirv-cross","stb")

5182
src/engine/dep/include/glad/glad.h Normal file
View File

File diff suppressed because it is too large Load Diff

162
src/engine/dep/include/glad/glad_wgl.h Normal file
View File

@ -0,0 +1,162 @@
/*
WGL loader generated by glad 0.1.33 on Thu Aug 22 10:36:32 2019.
Language/Generator: C/C++
Specification: wgl
APIs: wgl=1.0
Profile: -
Extensions:
WGL_ARB_create_context,
WGL_ARB_create_context_no_error,
WGL_ARB_create_context_profile,
WGL_ARB_create_context_robustness,
WGL_ARB_extensions_string,
WGL_EXT_extensions_string
Loader: True
Local files: False
Omit khrplatform: False
Reproducible: False
Commandline:
--api="wgl=1.0" --generator="c" --spec="wgl" --extensions="WGL_ARB_create_context,WGL_ARB_create_context_no_error,WGL_ARB_create_context_profile,WGL_ARB_create_context_robustness,WGL_ARB_extensions_string,WGL_EXT_extensions_string"
Online:
https://glad.dav1d.de/#language=c&specification=wgl&loader=on&api=wgl%3D1.0&extensions=WGL_ARB_create_context&extensions=WGL_ARB_create_context_no_error&extensions=WGL_ARB_create_context_profile&extensions=WGL_ARB_create_context_robustness&extensions=WGL_ARB_extensions_string&extensions=WGL_EXT_extensions_string
*/
#ifndef WINAPI
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1
#endif
#ifndef NOMINMAX
#define NOMINMAX 1
#endif
#include <windows.h>
#endif
#include <glad/glad.h>
#ifndef __glad_wglext_h_
#ifdef __wglext_h_
#error WGL header already included, remove this include, glad already provides it
#endif
#define __glad_wglext_h_
#define __wglext_h_
#ifndef APIENTRY
#define APIENTRY
#endif
#ifndef APIENTRYP
#define APIENTRYP APIENTRY *
#endif
#ifdef __cplusplus
extern "C" {
#endif
typedef void* (* GLADloadproc)(const char *name);
#ifndef GLAPI
# if defined(GLAD_GLAPI_EXPORT)
# if defined(_WIN32) || defined(__CYGWIN__)
# if defined(GLAD_GLAPI_EXPORT_BUILD)
# if defined(__GNUC__)
# define GLAPI __attribute__ ((dllexport)) extern
# else
# define GLAPI __declspec(dllexport) extern
# endif
# else
# if defined(__GNUC__)
# define GLAPI __attribute__ ((dllimport)) extern
# else
# define GLAPI __declspec(dllimport) extern
# endif
# endif
# elif defined(__GNUC__) && defined(GLAD_GLAPI_EXPORT_BUILD)
# define GLAPI __attribute__ ((visibility ("default"))) extern
# else
# define GLAPI extern
# endif
# else
# define GLAPI extern
# endif
#endif
GLAPI int gladLoadWGL(HDC hdc);
GLAPI int gladLoadWGLLoader(GLADloadproc, HDC hdc);
struct _GPU_DEVICE {
DWORD cb;
CHAR DeviceName[32];
CHAR DeviceString[128];
DWORD Flags;
RECT rcVirtualScreen;
};
DECLARE_HANDLE(HPBUFFERARB);
DECLARE_HANDLE(HPBUFFEREXT);
DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV);
DECLARE_HANDLE(HPVIDEODEV);
DECLARE_HANDLE(HPGPUNV);
DECLARE_HANDLE(HGPUNV);
DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
typedef struct _GPU_DEVICE GPU_DEVICE;
typedef struct _GPU_DEVICE *PGPU_DEVICE;
#define WGL_CONTEXT_DEBUG_BIT_ARB 0x00000001
#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093
#define WGL_CONTEXT_FLAGS_ARB 0x2094
#define ERROR_INVALID_VERSION_ARB 0x2095
#define WGL_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3
#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
#define ERROR_INVALID_PROFILE_ARB 0x2096
#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
#define WGL_LOSE_CONTEXT_ON_RESET_ARB 0x8252
#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
#define WGL_NO_RESET_NOTIFICATION_ARB 0x8261
#ifndef WGL_ARB_create_context
#define WGL_ARB_create_context 1
GLAPI int GLAD_WGL_ARB_create_context;
typedef HGLRC (APIENTRYP PFNWGLCREATECONTEXTATTRIBSARBPROC)(HDC hDC, HGLRC hShareContext, const int *attribList);
GLAPI PFNWGLCREATECONTEXTATTRIBSARBPROC glad_wglCreateContextAttribsARB;
#define wglCreateContextAttribsARB glad_wglCreateContextAttribsARB
#endif
#ifndef WGL_ARB_create_context_no_error
#define WGL_ARB_create_context_no_error 1
GLAPI int GLAD_WGL_ARB_create_context_no_error;
#endif
#ifndef WGL_ARB_create_context_profile
#define WGL_ARB_create_context_profile 1
GLAPI int GLAD_WGL_ARB_create_context_profile;
#endif
#ifndef WGL_ARB_create_context_robustness
#define WGL_ARB_create_context_robustness 1
GLAPI int GLAD_WGL_ARB_create_context_robustness;
#endif
#ifndef WGL_ARB_extensions_string
#define WGL_ARB_extensions_string 1
GLAPI int GLAD_WGL_ARB_extensions_string;
typedef const char * (APIENTRYP PFNWGLGETEXTENSIONSSTRINGARBPROC)(HDC hdc);
GLAPI PFNWGLGETEXTENSIONSSTRINGARBPROC glad_wglGetExtensionsStringARB;
#define wglGetExtensionsStringARB glad_wglGetExtensionsStringARB
#endif
#ifndef WGL_EXT_extensions_string
#define WGL_EXT_extensions_string 1
GLAPI int GLAD_WGL_EXT_extensions_string;
typedef const char * (APIENTRYP PFNWGLGETEXTENSIONSSTRINGEXTPROC)(void);
GLAPI PFNWGLGETEXTENSIONSSTRINGEXTPROC glad_wglGetExtensionsStringEXT;
#define wglGetExtensionsStringEXT glad_wglGetExtensionsStringEXT
#endif
#ifdef __cplusplus
}
#endif
#endif

1
src/engine/dep/xmake.lua
View File

@ -4,6 +4,7 @@ target("idk_dep")
add_includedirs("include", {public = true})
-- 添加链接库
add_links("steam_api64","MonoPosixHelper","mono-2.0-sgen","fmodL_vc", {public = true})
--add_links("shaderc_utild","shadercd",{public = true})
-- 添加链接库搜索路径
add_linkdirs("lib", {public = true})
add_headerfiles("include/*.h","include/**.h")

2
src/engine/editor/IDE.h
View File

@ -21,7 +21,7 @@ Accessible through Core::GetSystem<IDE>() [#include <IDE.h>]
#include <editor/commands/CommandController.h>
#include <editor/Registry.h>
#include <editor/ObjectSelection.h>
#include "windows/IGE_IWindow.h"
//#include "windows/IGE_IWindow.h"
#undef FindWindow
namespace idk

1
src/engine/game/AddSystems.cpp
View File

@ -15,6 +15,7 @@
#include <opengl/resource/OpenGLMesh.h>
#include <opengl/resource/OpenGLTexture.h>
#include <editor/IDE.h>
#include <windows/IGE_IWindow.h>
#include <file/FileSystem.h>
#include <debug/LogSystem.h>

71
src/xmake.lua
View File

@ -3,32 +3,26 @@ includes("engine/dep/xmake.lua")
target("idk")
set_kind("static")
add_deps("idk_dep")
add_packages("assimp","freetype","glad","glslang","spirv-cross","stb", {public = true})
add_links("ole32")
add_defines("_ENABLE_EXTENDED_ALIGNED_STORAGE")
add_packages("assimp", {public = true})
add_links("ole32", {public = true})
add_defines("_ENABLE_EXTENDED_ALIGNED_STORAGE", {public = true})
add_includedirs("engine", "engine/idk",{public = true})
add_files("engine/idk/*.cpp","engine/idk/**/*.cpp")
add_files("engine/idk/*.cpp","engine/idk/**/*.cpp|phys/PhysicsSystemNoMT.cpp")
add_headerfiles("engine/idk/*.h","engine/idk/**/*.h")
add_headerfiles("engine/idk/*.inl","engine/idk/**/*.inl")
target("asset_compiler")
set_kind("binary")
add_deps("idk")
add_packages("vulkansdk")
add_packages("vulkansdk","freetype")
add_syslinks("Shell32")
add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])
add_defines([[TEST_BIN_DIR=R"($(OutDir))"]])
add_includedirs("engine", "engine/asset_compiler", {public = true})
add_files("engine/asset_compiler/*.cpp")
add_headerfiles("engine/asset_compiler/*.h")
target("editor")
set_kind("binary")
add_deps("idk","vkn","editorstatic")
add_packages("vulkansdk")
add_syslinks("Shell32")
add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])
add_defines([[TEST_BIN_DIR=R"($(OutDir))"]])
set_kind("static")
add_deps("idk","vkn", "opengl","editorstatic", {public = true})
add_includedirs("engine", "engine/editor", {public = true})
add_files("engine/editor/*.cpp","engine/editor/**.cpp")
add_headerfiles("engine/editor/*.h","engine/editor/**.h")
@ -36,65 +30,39 @@ target("editor")
target("editorstatic")
set_kind("static")
add_deps("idk")
add_packages("vulkansdk")
add_syslinks("Shell32")
add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])
add_defines([[TEST_BIN_DIR=R"($(OutDir))"]])
add_packages("imgui", "glad","vulkansdk", {public = true})
add_includedirs("engine", "engine/editorstatic", {public = true})
add_files("engine/editorstatic/*.cpp","engine/editorstatic/**.cpp")
add_headerfiles("engine/editorstatic/*.h","engine/editorstatic/**.h")
add_headerfiles("engine/editorstatic/*.inl","engine/editorstatic/**.inl")
target("enginestatic")
set_kind("static")
add_deps("idk")
add_packages("vulkansdk")
add_syslinks("Shell32")
add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])
add_defines([[TEST_BIN_DIR=R"($(OutDir))"]])
add_includedirs("engine", "engine/enginestatic", {public = true})
add_files("engine/enginestatic/*.cpp")
target("game")
set_kind("binary")
add_deps("idk")
add_packages("vulkansdk")
add_syslinks("Shell32")
add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])
add_defines([[TEST_BIN_DIR=R"($(OutDir))"]])
add_deps("idk", "win32", "vkn", "editor", "asset_compiler")
add_includedirs("engine", "engine/game", {public = true})
add_files("engine/game/*.cpp")
add_headerfiles("engine/game/*.h")
target("launcher")
set_kind("binary")
add_deps("idk")
add_packages("vulkansdk")
add_syslinks("Shell32")
add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])
add_defines([[TEST_BIN_DIR=R"($(OutDir))"]])
add_deps("editor")
add_includedirs("engine", "engine/launcher", {public = true})
add_files("engine/launcher/*.cpp")
add_headerfiles("engine/launcher/*.h")
target("opengl")
set_kind("binary")
add_deps("idk")
add_packages("glad", "glfw")
add_syslinks("Shell32")
add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])
add_defines([[TEST_BIN_DIR=R"($(OutDir))"]])
set_kind("static")
add_deps("idk","win32")
add_packages("glfw","stb", {public = true})
add_includedirs("engine", "engine/opengl", {public = true})
add_files("engine/opengl/*.c")
add_files("engine/opengl/*.cpp","engine/opengl/**.cpp")
add_headerfiles("engine/opengl/*.h","engine/opengl/**.h")
target("vkn")
set_kind("static")
add_deps("idk","editorstatic","win32")
add_packages("vulkansdk")
add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])
add_defines([[TEST_BIN_DIR=R"($(OutDir))"]])
add_deps("idk","win32")
add_packages("vulkansdk","stb", "glslang","spirv-cross", {public = true})
add_includedirs("engine", "engine/vkn", {public = true})
add_files("engine/vkn/*.cpp","engine/vkn/**.cpp")
add_headerfiles("engine/vkn/*.h","engine/vkn/**.h")
@ -102,10 +70,9 @@ target("vkn")
target("win32")
set_kind("static")
add_deps("idk")
add_syslinks("Shell32")
add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])
add_defines([[TEST_BIN_DIR=R"($(OutDir))"]])
add_syslinks("Shell32", "Comdlg32", {public = true})
add_defines("UNICODE", {public = true})
add_includedirs("engine/idk")
add_includedirs("engine/win32", {public = true})
add_files("engine/win32/*.cpp")
add_headerfiles("engine/win32/*.h")