refactor: 更新json库引用路径为nlohmann/json
统一将项目中所有json/json.hpp引用改为nlohmann/json.hpp,并清理不再需要的头文件路径配置
This commit is contained in:
parent
a2b142eb99
commit
97220e9417
|
|
@ -1,7 +1,7 @@
|
||||||
#include <extra2d/effects/custom_effect_manager.h>
|
#include <extra2d/effects/custom_effect_manager.h>
|
||||||
#include <extra2d/utils/logger.h>
|
#include <extra2d/utils/logger.h>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <json/json.hpp>
|
#include <nlohmann/json.hpp>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
namespace extra2d {
|
namespace extra2d {
|
||||||
|
|
|
||||||
|
|
@ -267,7 +267,7 @@ private:
|
||||||
```cpp
|
```cpp
|
||||||
// ResLoader.cpp
|
// ResLoader.cpp
|
||||||
#include "ResLoader.h"
|
#include "ResLoader.h"
|
||||||
#include <json/json.hpp>
|
#include <nlohmann/json.hpp>
|
||||||
|
|
||||||
namespace flappybird {
|
namespace flappybird {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
#include "ResLoader.h"
|
#include "ResLoader.h"
|
||||||
#include <json/json.hpp>
|
#include <nlohmann/json.hpp>
|
||||||
|
|
||||||
namespace flappybird {
|
namespace flappybird {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ target("flappy_bird")
|
||||||
set_kind("binary")
|
set_kind("binary")
|
||||||
add_files("*.cpp")
|
add_files("*.cpp")
|
||||||
add_includedirs("../../Extra2D/include")
|
add_includedirs("../../Extra2D/include")
|
||||||
add_includedirs("../../Extra2D/include/json")
|
|
||||||
add_deps("extra2d")
|
add_deps("extra2d")
|
||||||
|
|
||||||
-- 使用与主项目相同的平台配置
|
-- 使用与主项目相同的平台配置
|
||||||
|
|
|
||||||
|
|
@ -23,9 +23,7 @@ function define_extra2d_engine()
|
||||||
|
|
||||||
-- 第三方库头文件路径
|
-- 第三方库头文件路径
|
||||||
add_includedirs("third_party/glad/include", {public = true})
|
add_includedirs("third_party/glad/include", {public = true})
|
||||||
add_includedirs("third_party/nlohmann", {public = true})
|
add_includedirs("third_party", {public = true})
|
||||||
add_includedirs("third_party/simpleini", {public = true})
|
|
||||||
add_includedirs("third_party/stb", {public = true})
|
|
||||||
|
|
||||||
-- 平台配置
|
-- 平台配置
|
||||||
local plat = get_current_plat()
|
local plat = get_current_plat()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue