update

CMakeLists.txt

@@ -59,7 +59,8 @@ if(MSVC)
 
 else()
     include_directories(${PROJECT_SOURCE_DIR}/3rdparty)
-    include_directories(/usr/include/lua5.3/)
+    include_directories(/usr/local/include)
+	add_definitions(-DfPIC)
 endif()
 
 
@@ -105,7 +106,7 @@ else()
 			ylib
 			leveldb
 			crypto
-			lua5.3
+			lua
 			pthread
 			sqlite3
 			dl
@@ -116,6 +117,7 @@ else()
 endif()
 
 add_definitions(-DFASTWEB_EXE)
+
 # 编译测试调用示例
 add_executable(${PROJECT_NAME} 
 	tests/main.cpp

tests/fastweb.cpp

@@ -91,11 +91,11 @@ fastweb::fastweb(const std::vector<std::string> &param)
 
     if(equals({"start"},2))
     {
-        start(param[1],false);
+        start(param[1]);
     }
     else if(equals({"start2"},2))
     {
-        start(param[1],true);
+        start(param[1]);
     }
     else if(equals({"create","config"},3))
     {
@@ -127,7 +127,7 @@ fastweb::~fastweb()
 {
 }
 
-void fastweb::start(std::string ini_filepath, bool wait)
+void fastweb::start(std::string ini_filepath)
 {
     ini_filepath = std::filesystem::absolute(ini_filepath).string();
 
@@ -135,6 +135,7 @@ void fastweb::start(std::string ini_filepath, bool wait)
     {
         if (fastweb_start(ini_filepath.c_str()) == nullptr)
             return;
+        wait();
     }
     else
     {

tests/fastweb.h

@@ -26,7 +26,7 @@ private:
     /// @brief 启动
     /// @param ini_filepath 
     /// @param wait
-    void start(std::string ini_filepath,bool wait);
+    void start(std::string ini_filepath);
     /// @brief 停止
     /// @param app 
     void stop(void* app);