竟然能跑起来了
This commit is contained in:
		
							parent
							
								
									fceac0db7d
								
							
						
					
					
						commit
						b773525efe
					
				| @ -672,8 +672,10 @@ namespace idk { | ||||
|                 current_dir = path; | ||||
|                 filter.Clear(); | ||||
|             } | ||||
|             else | ||||
|                 OnAssetDoubleClicked.Fire(Core::GetSystem<IDE>().GetSelectedObjects().assets[0]); | ||||
|             else { | ||||
|                 auto& ps = Core::GetSystem<IDE>().GetSelectedObjects(); | ||||
|                 OnAssetDoubleClicked.Fire(ps.assets[0]); | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|  | ||||
| @ -63,7 +63,8 @@ namespace idk::mono | ||||
| 		assert(monoPath); | ||||
| 		auto& filesys = Core::GetSystem<FileSystem>(); | ||||
| 		filesys.Mount(monoPath, "/mono"); | ||||
| 		mono_set_assemblies_path("mono/lib/mono/4.5"); | ||||
| 		string sssemblies = filesys.GetFullPath("/mono/lib/mono/4.5"); | ||||
| 		mono_set_assemblies_path(sssemblies.c_str()); | ||||
| 		mono_set_dirs(filesys.GetFullPath("/mono/lib/").data(), filesys.GetFullPath("/mono/etc/").data()); | ||||
| 		mono_trace_set_print_handler([](const char* string, [[maybe_unused]] mono_bool is_stdout) { | ||||
| 			LOG_TO(LogPool::MONO, string); | ||||
|  | ||||
| @ -206,7 +206,7 @@ namespace idk::vkn | ||||
| 			origin_nodes.emplace(rsc.id, id); | ||||
| 			auto src_id = rsc_manager.GetPrevious(rsc.id); | ||||
| 			//If this is not earliest.
 | ||||
| 			if (rsc_manager.GetPrevious(*src_id)) | ||||
| 			if (src_id && rsc_manager.GetPrevious(*src_id)) | ||||
| 			{ | ||||
| 				resource_layouts.emplace(rsc.id,resource_layouts.at(*src_id)); | ||||
| 			} | ||||
|  | ||||
| @ -4,7 +4,7 @@ | ||||
| 
 | ||||
| namespace std | ||||
| { | ||||
| 	/*template<>
 | ||||
| 	template<> | ||||
| 	struct hash<vk::DescriptorSetLayout> | ||||
| 	{ | ||||
| 		size_t operator()(const vk::DescriptorSetLayout& dsl)const | ||||
| @ -27,5 +27,5 @@ namespace std | ||||
| 		{ | ||||
| 			return reinterpret_cast<intptr_t>(s.operator VkSemaphore()); | ||||
| 		} | ||||
| 	};*/ | ||||
| 	}; | ||||
| } | ||||
|  | ||||
| @ -6,8 +6,8 @@ | ||||
| #include <res/MetaBundle.h> | ||||
| int main(int argc, char** argv) | ||||
| { | ||||
| 	idk::MetaBundle m; | ||||
| 	serialize_text(m); | ||||
| 	idk::Guid m; | ||||
| 	string res = serialize_text(m); | ||||
| 	testing::InitGoogleTest(&argc, argv); | ||||
| 	return RUN_ALL_TESTS(); | ||||
| } | ||||
|  | ||||
| @ -7,7 +7,7 @@ set_config("vs_toolset", "14.2") | ||||
| set_toolchains("msvc") | ||||
| set_runtimes("MDd") | ||||
| -- 添加 /bigobj 编译选项 | ||||
| add_cxflags("/bigobj", "-MDd", {force = true}) | ||||
| add_cxflags("/bigobj", {force = true}) | ||||
| includes("src/xmake.lua") | ||||
| --__std_find_trivial_1 msvc 版本不一致会有这个报错 | ||||
| --xmake project -k vsxmake2022 -a x64 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user