From 002fd6f882479fe3f6f9fbefec9d49852351a61f Mon Sep 17 00:00:00 2001 From: Zengtudor Date: Sun, 18 Aug 2024 14:12:20 +0800 Subject: [PATCH] update --- src/main.cpp | 14 +++++++---- xmake.lua | 69 ---------------------------------------------------- 2 files changed, 9 insertions(+), 74 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 0f2c56b..d796e20 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -61,8 +61,8 @@ struct Test{ struct ProgramRet{ #ifdef _WIN32 - time_point start; - time_point end; + time_point start; + time_point end; #else time_point start; time_point end; @@ -71,14 +71,18 @@ struct ProgramRet{ path outPath; unsigned int id; friend std::ostream& operator<<(std::ostream&os,ProgramRet&ret){ - os<<"ProgramRet { start: "< T getValueOrPanic(T value); -int compareFiles(const std::string& path1, const std::string& path2); +int compareFiles(const path &path1, const path &path2) ; struct Statu{ bool isTLE = false; @@ -260,7 +264,7 @@ void trimTrailingWhitespace(std::string& str) { }).base(), str.end()); } -int compareFiles(const std::string& path1, const std::string& path2) { +int compareFiles(const path &path1, const path &path2) { std::ifstream file1(path1); std::ifstream file2(path2); diff --git a/xmake.lua b/xmake.lua index 4fbb3f0..67025e9 100644 --- a/xmake.lua +++ b/xmake.lua @@ -7,72 +7,3 @@ target("xj") set_kind("binary") add_files("src/*.cpp") add_packages("jsoncpp") --- --- If you want to known more usage about xmake, please see https://xmake.io --- --- ## FAQ --- --- You can enter the project directory firstly before building project. --- --- $ cd projectdir --- --- 1. How to build project? --- --- $ xmake --- --- 2. How to configure project? --- --- $ xmake f -p [macosx|linux|iphoneos ..] -a [x86_64|i386|arm64 ..] -m [debug|release] --- --- 3. Where is the build output directory? --- --- The default output directory is `./build` and you can configure the output directory. --- --- $ xmake f -o outputdir --- $ xmake --- --- 4. How to run and debug target after building project? --- --- $ xmake run [targetname] --- $ xmake run -d [targetname] --- --- 5. How to install target to the system directory or other output directory? --- --- $ xmake install --- $ xmake install -o installdir --- --- 6. Add some frequently-used compilation flags in xmake.lua --- --- @code --- -- add debug and release modes --- add_rules("mode.debug", "mode.release") --- --- -- add macro definition --- add_defines("NDEBUG", "_GNU_SOURCE=1") --- --- -- set warning all as error --- set_warnings("all", "error") --- --- -- set language: c99, c++11 --- set_languages("c99", "c++11") --- --- -- set optimization: none, faster, fastest, smallest --- set_optimize("fastest") --- --- -- add include search directories --- add_includedirs("/usr/include", "/usr/local/include") --- --- -- add link libraries and search directories --- add_links("tbox") --- add_linkdirs("/usr/local/lib", "/usr/lib") --- --- -- add system link libraries --- add_syslinks("z", "pthread") --- --- -- add compilation and link flags --- add_cxflags("-stdnolib", "-fno-strict-aliasing") --- add_ldflags("-L/usr/local/lib", "-lpthread", {force = true}) --- --- @endcode --- -