diff --git a/packages/.vscode/launch.json b/packages/.vscode/launch.json index acf978e..07a5c90 100644 --- a/packages/.vscode/launch.json +++ b/packages/.vscode/launch.json @@ -17,5 +17,10 @@ ], "ideConnectDebugger": true } - ] + ], + "diagnostics": { + "disable": [ + "undefined-global" + ] + }, } \ No newline at end of file diff --git a/packages/i/imgui/latest/build_039068a0/.build_cache/64/64588a572c1cdb91855b1ca9630bb680 b/packages/i/imgui/latest/build_039068a0/.build_cache/64/64588a572c1cdb91855b1ca9630bb680 deleted file mode 100644 index 5f9dbb3..0000000 Binary files a/packages/i/imgui/latest/build_039068a0/.build_cache/64/64588a572c1cdb91855b1ca9630bb680 and /dev/null differ diff --git a/packages/i/imgui/latest/build_039068a0/.build_cache/94/94d2b5197b16734609f24a02de613381 b/packages/i/imgui/latest/build_039068a0/.build_cache/94/94d2b5197b16734609f24a02de613381 deleted file mode 100644 index 208266b..0000000 Binary files a/packages/i/imgui/latest/build_039068a0/.build_cache/94/94d2b5197b16734609f24a02de613381 and /dev/null differ diff --git a/packages/i/imgui/latest/build_039068a0/.build_cache/9e/9e1da3980fe5280271962cc7591c0596 b/packages/i/imgui/latest/build_039068a0/.build_cache/9e/9e1da3980fe5280271962cc7591c0596 deleted file mode 100644 index f5fb41c..0000000 Binary files a/packages/i/imgui/latest/build_039068a0/.build_cache/9e/9e1da3980fe5280271962cc7591c0596 and /dev/null differ diff --git a/packages/i/imgui/latest/build_039068a0/.build_cache/bb/bbec6acaed982dca34870f715934f4a1 b/packages/i/imgui/latest/build_039068a0/.build_cache/bb/bbec6acaed982dca34870f715934f4a1 deleted file mode 100644 index 0fc6482..0000000 Binary files a/packages/i/imgui/latest/build_039068a0/.build_cache/bb/bbec6acaed982dca34870f715934f4a1 and /dev/null differ diff --git a/packages/i/imgui/latest/build_039068a0/.build_cache/c2/c2c707149bc39f212920c5f063365d98 b/packages/i/imgui/latest/build_039068a0/.build_cache/c2/c2c707149bc39f212920c5f063365d98 deleted file mode 100644 index 6b08acc..0000000 Binary files a/packages/i/imgui/latest/build_039068a0/.build_cache/c2/c2c707149bc39f212920c5f063365d98 and /dev/null differ diff --git a/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/imgui.lib.d b/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/imgui.lib.d deleted file mode 100644 index 3177c4e..0000000 --- a/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/imgui.lib.d +++ /dev/null @@ -1,15 +0,0 @@ -{ - values = { - "ar", - { - "-cr" - } - }, - files = { - [[build_039068a0\.objs\imgui\windows\x64\debug\src\imgui.cpp.obj]], - [[build_039068a0\.objs\imgui\windows\x64\debug\src\imgui_demo.cpp.obj]], - [[build_039068a0\.objs\imgui\windows\x64\debug\src\imgui_draw.cpp.obj]], - [[build_039068a0\.objs\imgui\windows\x64\debug\src\imgui_tables.cpp.obj]], - [[build_039068a0\.objs\imgui\windows\x64\debug\src\imgui_widgets.cpp.obj]] - } -} \ No newline at end of file diff --git a/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui.cpp.obj.d b/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui.cpp.obj.d deleted file mode 100644 index bb96a53..0000000 --- a/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui.cpp.obj.d +++ /dev/null @@ -1,19 +0,0 @@ -{ - depfiles_gcc = "build_039068a0\\.objs\\imgui\\windows\\x64\\debug\\src\\__cpp_imgui.cpp.cpp: src\\imgui.cpp include\\imgui.h include\\imconfig.h include\\imgui_internal.h include\\imstb_textedit.h\ -", - values = { - "clang", - { - "-Qunused-arguments", - "-m64", - "-stdlib=libc++", - [[-cxx-isystemD:\LLVM\include\c++\v1]], - "-Iinclude", - "-fexceptions", - "-fcxx-exceptions" - } - }, - files = { - [[src\imgui.cpp]] - } -} \ No newline at end of file diff --git a/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui_demo.cpp.obj.d b/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui_demo.cpp.obj.d deleted file mode 100644 index 7d7ca3c..0000000 --- a/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui_demo.cpp.obj.d +++ /dev/null @@ -1,19 +0,0 @@ -{ - depfiles_gcc = "build_039068a0\\.objs\\imgui\\windows\\x64\\debug\\src\\__cpp_imgui_demo.cpp.cpp: src\\imgui_demo.cpp include\\imgui.h include\\imconfig.h\ -", - values = { - "clang", - { - "-Qunused-arguments", - "-m64", - "-stdlib=libc++", - [[-cxx-isystemD:\LLVM\include\c++\v1]], - "-Iinclude", - "-fexceptions", - "-fcxx-exceptions" - } - }, - files = { - [[src\imgui_demo.cpp]] - } -} \ No newline at end of file diff --git a/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui_draw.cpp.obj.d b/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui_draw.cpp.obj.d deleted file mode 100644 index 03a53cd..0000000 --- a/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui_draw.cpp.obj.d +++ /dev/null @@ -1,19 +0,0 @@ -{ - depfiles_gcc = "build_039068a0\\.objs\\imgui\\windows\\x64\\debug\\src\\__cpp_imgui_draw.cpp.cpp: src\\imgui_draw.cpp include\\imgui.h include\\imconfig.h include\\imgui_internal.h include\\imstb_textedit.h include\\imstb_rectpack.h include\\imstb_truetype.h\ -", - values = { - "clang", - { - "-Qunused-arguments", - "-m64", - "-stdlib=libc++", - [[-cxx-isystemD:\LLVM\include\c++\v1]], - "-Iinclude", - "-fexceptions", - "-fcxx-exceptions" - } - }, - files = { - [[src\imgui_draw.cpp]] - } -} \ No newline at end of file diff --git a/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui_tables.cpp.obj.d b/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui_tables.cpp.obj.d deleted file mode 100644 index a91754a..0000000 --- a/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui_tables.cpp.obj.d +++ /dev/null @@ -1,19 +0,0 @@ -{ - depfiles_gcc = "build_039068a0\\.objs\\imgui\\windows\\x64\\debug\\src\\__cpp_imgui_tables.cpp.cpp: src\\imgui_tables.cpp include\\imgui.h include\\imconfig.h include\\imgui_internal.h include\\imstb_textedit.h\ -", - values = { - "clang", - { - "-Qunused-arguments", - "-m64", - "-stdlib=libc++", - [[-cxx-isystemD:\LLVM\include\c++\v1]], - "-Iinclude", - "-fexceptions", - "-fcxx-exceptions" - } - }, - files = { - [[src\imgui_tables.cpp]] - } -} \ No newline at end of file diff --git a/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui_widgets.cpp.obj.d b/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui_widgets.cpp.obj.d deleted file mode 100644 index 50a3be0..0000000 --- a/packages/i/imgui/latest/build_039068a0/.deps/imgui/windows/x64/debug/src/imgui_widgets.cpp.obj.d +++ /dev/null @@ -1,19 +0,0 @@ -{ - depfiles_gcc = "build_039068a0\\.objs\\imgui\\windows\\x64\\debug\\src\\__cpp_imgui_widgets.cpp.cpp: src\\imgui_widgets.cpp include\\imgui.h include\\imconfig.h include\\imgui_internal.h include\\imstb_textedit.h\ -", - values = { - "clang", - { - "-Qunused-arguments", - "-m64", - "-stdlib=libc++", - [[-cxx-isystemD:\LLVM\include\c++\v1]], - "-Iinclude", - "-fexceptions", - "-fcxx-exceptions" - } - }, - files = { - [[src\imgui_widgets.cpp]] - } -} \ No newline at end of file diff --git a/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui.cpp.obj b/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui.cpp.obj deleted file mode 100644 index f5fb41c..0000000 Binary files a/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui.cpp.obj and /dev/null differ diff --git a/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui_demo.cpp.obj b/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui_demo.cpp.obj deleted file mode 100644 index 5f9dbb3..0000000 Binary files a/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui_demo.cpp.obj and /dev/null differ diff --git a/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui_draw.cpp.obj b/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui_draw.cpp.obj deleted file mode 100644 index 6b08acc..0000000 Binary files a/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui_draw.cpp.obj and /dev/null differ diff --git a/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui_tables.cpp.obj b/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui_tables.cpp.obj deleted file mode 100644 index 208266b..0000000 Binary files a/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui_tables.cpp.obj and /dev/null differ diff --git a/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui_widgets.cpp.obj b/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui_widgets.cpp.obj deleted file mode 100644 index 0fc6482..0000000 Binary files a/packages/i/imgui/latest/build_039068a0/.objs/imgui/windows/x64/debug/src/imgui_widgets.cpp.obj and /dev/null differ diff --git a/packages/i/imgui/latest/build_039068a0/windows/x64/debug/imgui.lib b/packages/i/imgui/latest/build_039068a0/windows/x64/debug/imgui.lib deleted file mode 100644 index a5602e0..0000000 Binary files a/packages/i/imgui/latest/build_039068a0/windows/x64/debug/imgui.lib and /dev/null differ diff --git a/packages/i/imgui/latest/xmake.lua b/packages/i/imgui/latest/xmake.lua index 3328a50..4c9d927 100644 --- a/packages/i/imgui/latest/xmake.lua +++ b/packages/i/imgui/latest/xmake.lua @@ -1,3 +1,4 @@ +add_rules("mode.debug", "mode.release") target("imgui") set_kind("static") add_files("src/*.cpp") diff --git a/packages/i/imgui/xmake.lua b/packages/i/imgui/xmake.lua index b7a2640..a5b29cd 100644 --- a/packages/i/imgui/xmake.lua +++ b/packages/i/imgui/xmake.lua @@ -3,23 +3,17 @@ package("imgui") set_description("v1.90.6") set_sourcedir(path.join(os.scriptdir(), "latest")) add_configs("copy", {description = "wheter copy lib to buildir", default = false, type = "boolean"}) - -- on_install(function(package) - --print("package.tools.xmake") - --import("package.tools.xmake").install(package,{},{buildir = path.join(os.scriptdir(), "build")}) - --end) on_fetch(function(package, opt) - local buildir = package:buildir() - - print(buildir) + package:config_set("debug",true) + package:config_set("runtimes","c++_static") local root = package:sourcedir() os.cd(root) - import("package.tools.xmake").install(package, {}) + local buildir = package:buildir() + buildir = path.join(root, buildir, os:host(), package:arch(), package:mode()) + import("package.tools.xmake").install(package, {kind = "static"}) local includedirs = {path.join(root, "include")} - local mode = package:config("debug") and "Debug" or "Realease" - local linkdirs = {path.join(root, "build/" .. mode)} local links = {package:name()} - print(linkdirs, links) return { - includedirs = includedirs, linkdirs = linkdirs, links = links + includedirs = includedirs, linkdirs = buildir, links = links } - end) \ No newline at end of file + end) diff --git a/packages/rule.lua b/packages/rule.lua new file mode 100644 index 0000000..770c531 --- /dev/null +++ b/packages/rule.lua @@ -0,0 +1,19 @@ +on_install(function(package) + local configs = {kind = "static"} + package:config_set("debug",true) + import("package.tools.xmake").install(package, configs) +end) +on_fetch(function(package, opt) + package:config_set("debug",true) + package:config_set("runtimes","c++_static") + local root = package:sourcedir() + os.cd(root) + local buildir = package:buildir() + buildir = path.join(root, buildir, os:host(), package:arch(), package:mode()) + import("package.tools.xmake").install(package, {kind = "static"}) + local includedirs = {path.join(root, "include")} + local links = {package:name()} + return { + includedirs = includedirs, linkdirs = buildir, links = links + } +end) \ No newline at end of file