[MOD] Remove optional folder.

paintdream · May 30, 2023 · 826ff63 · 826ff63
1 parent 114481d
commit 826ff63
Show file tree

Hide file tree

Showing 78 changed files with 17 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ PROJECT (iris_demo)
 
 SET (STDLIB stdc++)
 
-ENABLE_TESTING()
+ENABLE_TESTING ()
 
 OPTION (ENABLE_COROUTINE "Enable Iris Coroutine support" ON)
 OPTION (ENABLE_LUA "Enable Lua Binding support" ON)
@@ -38,7 +38,7 @@ ADD_EXECUTABLE (iris_dispatcher_demo ${IRIS_DISPATCHER_DEMO_SRC})
 ADD_TEST (test_dispatcher iris_dispatcher_demo)
 
 IF (NOT MSVC)
-	TARGET_LINK_LIBRARIES(iris_dispatcher_demo m ${STDLIB} pthread)
+	TARGET_LINK_LIBRARIES (iris_dispatcher_demo m ${STDLIB} pthread)
 ENDIF (NOT MSVC)
 
 FILE (GLOB_RECURSE IRIS_SYSTEM_DEMO_SRC
@@ -52,7 +52,7 @@ ADD_EXECUTABLE (iris_system_demo ${IRIS_SYSTEM_DEMO_SRC})
 ADD_TEST (test_system iris_system_demo)
 
 IF (NOT MSVC)
-	TARGET_LINK_LIBRARIES(iris_system_demo m ${STDLIB} pthread)
+	TARGET_LINK_LIBRARIES (iris_system_demo m ${STDLIB} pthread)
 ENDIF (NOT MSVC)
 
 FILE (GLOB_RECURSE IRIS_TREE_DEMO_SRC
@@ -66,7 +66,7 @@ ADD_EXECUTABLE (iris_tree_demo ${IRIS_TREE_DEMO_SRC})
 ADD_TEST (test_tree iris_tree_demo)
 
 IF (NOT MSVC)
-	TARGET_LINK_LIBRARIES(iris_tree_demo m ${STDLIB} pthread)
+	TARGET_LINK_LIBRARIES (iris_tree_demo m ${STDLIB} pthread)
 ENDIF (NOT MSVC)
 
 FILE (GLOB_RECURSE IRIS_BUFFER_DEMO_SRC
@@ -80,7 +80,7 @@ ADD_EXECUTABLE (iris_buffer_demo ${IRIS_BUFFER_DEMO_SRC})
 ADD_TEST (test_buffer iris_buffer_demo)
 
 IF (NOT MSVC)
-	TARGET_LINK_LIBRARIES(iris_buffer_demo m ${STDLIB} pthread)
+	TARGET_LINK_LIBRARIES (iris_buffer_demo m ${STDLIB} pthread)
 ENDIF (NOT MSVC)
 
 IF (ENABLE_COROUTINE)
@@ -96,7 +96,7 @@ IF (ENABLE_COROUTINE)
 	ADD_TEST (test_coroutine iris_coroutine_demo)
 
 	IF (NOT MSVC)
-		TARGET_LINK_LIBRARIES(iris_coroutine_demo m ${STDLIB} pthread)
+		TARGET_LINK_LIBRARIES (iris_coroutine_demo m ${STDLIB} pthread)
 	ENDIF (NOT MSVC)
 
 	FILE (GLOB_RECURSE IRIS_ENGINE_DEMO_SRC
@@ -111,13 +111,13 @@ IF (ENABLE_COROUTINE)
 	ADD_TEST (test_engine iris_engine_demo)
 
 	IF (NOT MSVC)
-		TARGET_LINK_LIBRARIES(iris_engine_demo m ${STDLIB} pthread)
+		TARGET_LINK_LIBRARIES (iris_engine_demo m ${STDLIB} pthread)
 	ENDIF (NOT MSVC)
 ENDIF (ENABLE_COROUTINE)
 
 IF (ENABLE_LUA)
 	FILE (GLOB_RECURSE IRIS_LUA_DEMO_SRC
-		"${PROJECT_SOURCE_DIR}/src/optional/iris_lua.h"
+		"${PROJECT_SOURCE_DIR}/src/iris_lua.h"
 		"${PROJECT_SOURCE_DIR}/test/iris_lua_demo.cpp"
 	)
 
@@ -131,13 +131,13 @@ IF (ENABLE_LUA)
 		MESSAGE (STATUS "Use built-in lua version.")
 		# default to lua 5.4
 		FILE (GLOB_RECURSE IRIS_LUA_CORE_SRC
-			"${PROJECT_SOURCE_DIR}/src/optional/lua/src/*.h"
-			"${PROJECT_SOURCE_DIR}/src/optional/lua/src/*.hpp"
-			"${PROJECT_SOURCE_DIR}/src/optional/lua/src/*.c"
+			"${PROJECT_SOURCE_DIR}/src/lua/src/*.h"
+			"${PROJECT_SOURCE_DIR}/src/lua/src/*.hpp"
+			"${PROJECT_SOURCE_DIR}/src/lua/src/*.c"
 		)
 
-		LIST (REMOVE_ITEM IRIS_LUA_CORE_SRC "${PROJECT_SOURCE_DIR}/src/optional/lua/src/lua.c")
-		LIST (REMOVE_ITEM IRIS_LUA_CORE_SRC "${PROJECT_SOURCE_DIR}/src/optional/lua/src/luac.c")
+		LIST (REMOVE_ITEM IRIS_LUA_CORE_SRC "${PROJECT_SOURCE_DIR}/src/lua/src/lua.c")
+		LIST (REMOVE_ITEM IRIS_LUA_CORE_SRC "${PROJECT_SOURCE_DIR}/src/lua/src/luac.c")
 		SET (LUALIB)
 	ELSE (ENABLE_LUA_BUILTIN)
 		IF (${USE_LUA_VERSION} STREQUAL "LuaJIT")
@@ -173,8 +173,8 @@ IF (ENABLE_LUA)
 	ADD_TEST (test_lua iris_lua_demo)
 
 	IF (MSVC)
-		TARGET_LINK_LIBRARIES(iris_lua_demo ${LUALIB})
+		TARGET_LINK_LIBRARIES (iris_lua_demo ${LUALIB})
 	ELSE (MSVC)
-		TARGET_LINK_LIBRARIES(iris_lua_demo m ${STDLIB} ${LUALIB})
+		TARGET_LINK_LIBRARIES (iris_lua_demo m ${STDLIB} ${LUALIB})
 	ENDIF (MSVC)
 ENDIF (ENABLE_LUA)
diff --git a/src/optional/iris_lua.h → src/iris_lua.h b/src/optional/iris_lua.h → src/iris_lua.h
@@ -29,7 +29,7 @@ SOFTWARE.
 
 #pragma once
 
-#include "../iris_common.h"
+#include "iris_common.h"
 #include <array>
 
 extern "C" {

diff --git a/src/optional/lua/Makefile → src/lua/Makefile b/src/optional/lua/Makefile → src/lua/Makefile
diff --git a/src/optional/lua/README → src/lua/README b/src/optional/lua/README → src/lua/README
diff --git a/src/optional/lua/doc/contents.html → src/lua/doc/contents.html b/src/optional/lua/doc/contents.html → src/lua/doc/contents.html
diff --git a/src/optional/lua/doc/index.css → src/lua/doc/index.css b/src/optional/lua/doc/index.css → src/lua/doc/index.css
diff --git a/src/optional/lua/doc/logo.gif → src/lua/doc/logo.gif b/src/optional/lua/doc/logo.gif → src/lua/doc/logo.gif
diff --git a/src/optional/lua/doc/lua.1 → src/lua/doc/lua.1 b/src/optional/lua/doc/lua.1 → src/lua/doc/lua.1
diff --git a/src/optional/lua/doc/lua.css → src/lua/doc/lua.css b/src/optional/lua/doc/lua.css → src/lua/doc/lua.css
diff --git a/src/optional/lua/doc/luac.1 → src/lua/doc/luac.1 b/src/optional/lua/doc/luac.1 → src/lua/doc/luac.1
diff --git a/src/optional/lua/doc/manual.css → src/lua/doc/manual.css b/src/optional/lua/doc/manual.css → src/lua/doc/manual.css
diff --git a/src/optional/lua/doc/manual.html → src/lua/doc/manual.html b/src/optional/lua/doc/manual.html → src/lua/doc/manual.html
diff --git a/src/optional/lua/doc/osi-certified-72x60.png → src/lua/doc/osi-certified-72x60.png b/src/optional/lua/doc/osi-certified-72x60.png → src/lua/doc/osi-certified-72x60.png
diff --git a/src/optional/lua/doc/readme.html → src/lua/doc/readme.html b/src/optional/lua/doc/readme.html → src/lua/doc/readme.html
diff --git a/src/optional/lua/src/Makefile → src/lua/src/Makefile b/src/optional/lua/src/Makefile → src/lua/src/Makefile
diff --git a/src/optional/lua/src/lapi.c → src/lua/src/lapi.c b/src/optional/lua/src/lapi.c → src/lua/src/lapi.c
diff --git a/src/optional/lua/src/lapi.h → src/lua/src/lapi.h b/src/optional/lua/src/lapi.h → src/lua/src/lapi.h
diff --git a/src/optional/lua/src/lauxlib.c → src/lua/src/lauxlib.c b/src/optional/lua/src/lauxlib.c → src/lua/src/lauxlib.c
diff --git a/src/optional/lua/src/lauxlib.h → src/lua/src/lauxlib.h b/src/optional/lua/src/lauxlib.h → src/lua/src/lauxlib.h
diff --git a/src/optional/lua/src/lbaselib.c → src/lua/src/lbaselib.c b/src/optional/lua/src/lbaselib.c → src/lua/src/lbaselib.c
diff --git a/src/optional/lua/src/lcode.c → src/lua/src/lcode.c b/src/optional/lua/src/lcode.c → src/lua/src/lcode.c
diff --git a/src/optional/lua/src/lcode.h → src/lua/src/lcode.h b/src/optional/lua/src/lcode.h → src/lua/src/lcode.h
diff --git a/src/optional/lua/src/lcorolib.c → src/lua/src/lcorolib.c b/src/optional/lua/src/lcorolib.c → src/lua/src/lcorolib.c
diff --git a/src/optional/lua/src/lctype.c → src/lua/src/lctype.c b/src/optional/lua/src/lctype.c → src/lua/src/lctype.c
diff --git a/src/optional/lua/src/lctype.h → src/lua/src/lctype.h b/src/optional/lua/src/lctype.h → src/lua/src/lctype.h
diff --git a/src/optional/lua/src/ldblib.c → src/lua/src/ldblib.c b/src/optional/lua/src/ldblib.c → src/lua/src/ldblib.c
diff --git a/src/optional/lua/src/ldebug.c → src/lua/src/ldebug.c b/src/optional/lua/src/ldebug.c → src/lua/src/ldebug.c
diff --git a/src/optional/lua/src/ldebug.h → src/lua/src/ldebug.h b/src/optional/lua/src/ldebug.h → src/lua/src/ldebug.h
diff --git a/src/optional/lua/src/ldo.c → src/lua/src/ldo.c b/src/optional/lua/src/ldo.c → src/lua/src/ldo.c
diff --git a/src/optional/lua/src/ldo.h → src/lua/src/ldo.h b/src/optional/lua/src/ldo.h → src/lua/src/ldo.h
diff --git a/src/optional/lua/src/ldump.c → src/lua/src/ldump.c b/src/optional/lua/src/ldump.c → src/lua/src/ldump.c
diff --git a/src/optional/lua/src/lfunc.c → src/lua/src/lfunc.c b/src/optional/lua/src/lfunc.c → src/lua/src/lfunc.c
diff --git a/src/optional/lua/src/lfunc.h → src/lua/src/lfunc.h b/src/optional/lua/src/lfunc.h → src/lua/src/lfunc.h
diff --git a/src/optional/lua/src/lgc.c → src/lua/src/lgc.c b/src/optional/lua/src/lgc.c → src/lua/src/lgc.c
diff --git a/src/optional/lua/src/lgc.h → src/lua/src/lgc.h b/src/optional/lua/src/lgc.h → src/lua/src/lgc.h
diff --git a/src/optional/lua/src/linit.c → src/lua/src/linit.c b/src/optional/lua/src/linit.c → src/lua/src/linit.c
diff --git a/src/optional/lua/src/liolib.c → src/lua/src/liolib.c b/src/optional/lua/src/liolib.c → src/lua/src/liolib.c
diff --git a/src/optional/lua/src/ljumptab.h → src/lua/src/ljumptab.h b/src/optional/lua/src/ljumptab.h → src/lua/src/ljumptab.h
diff --git a/src/optional/lua/src/llex.c → src/lua/src/llex.c b/src/optional/lua/src/llex.c → src/lua/src/llex.c
diff --git a/src/optional/lua/src/llex.h → src/lua/src/llex.h b/src/optional/lua/src/llex.h → src/lua/src/llex.h
diff --git a/src/optional/lua/src/llimits.h → src/lua/src/llimits.h b/src/optional/lua/src/llimits.h → src/lua/src/llimits.h
diff --git a/src/optional/lua/src/lmathlib.c → src/lua/src/lmathlib.c b/src/optional/lua/src/lmathlib.c → src/lua/src/lmathlib.c
diff --git a/src/optional/lua/src/lmem.c → src/lua/src/lmem.c b/src/optional/lua/src/lmem.c → src/lua/src/lmem.c
diff --git a/src/optional/lua/src/lmem.h → src/lua/src/lmem.h b/src/optional/lua/src/lmem.h → src/lua/src/lmem.h
diff --git a/src/optional/lua/src/loadlib.c → src/lua/src/loadlib.c b/src/optional/lua/src/loadlib.c → src/lua/src/loadlib.c
diff --git a/src/optional/lua/src/lobject.c → src/lua/src/lobject.c b/src/optional/lua/src/lobject.c → src/lua/src/lobject.c
diff --git a/src/optional/lua/src/lobject.h → src/lua/src/lobject.h b/src/optional/lua/src/lobject.h → src/lua/src/lobject.h
diff --git a/src/optional/lua/src/lopcodes.c → src/lua/src/lopcodes.c b/src/optional/lua/src/lopcodes.c → src/lua/src/lopcodes.c
diff --git a/src/optional/lua/src/lopcodes.h → src/lua/src/lopcodes.h b/src/optional/lua/src/lopcodes.h → src/lua/src/lopcodes.h
diff --git a/src/optional/lua/src/lopnames.h → src/lua/src/lopnames.h b/src/optional/lua/src/lopnames.h → src/lua/src/lopnames.h
diff --git a/src/optional/lua/src/loslib.c → src/lua/src/loslib.c b/src/optional/lua/src/loslib.c → src/lua/src/loslib.c
diff --git a/src/optional/lua/src/lparser.c → src/lua/src/lparser.c b/src/optional/lua/src/lparser.c → src/lua/src/lparser.c
diff --git a/src/optional/lua/src/lparser.h → src/lua/src/lparser.h b/src/optional/lua/src/lparser.h → src/lua/src/lparser.h
diff --git a/src/optional/lua/src/lprefix.h → src/lua/src/lprefix.h b/src/optional/lua/src/lprefix.h → src/lua/src/lprefix.h
diff --git a/src/optional/lua/src/lstate.c → src/lua/src/lstate.c b/src/optional/lua/src/lstate.c → src/lua/src/lstate.c
diff --git a/src/optional/lua/src/lstate.h → src/lua/src/lstate.h b/src/optional/lua/src/lstate.h → src/lua/src/lstate.h
diff --git a/src/optional/lua/src/lstring.c → src/lua/src/lstring.c b/src/optional/lua/src/lstring.c → src/lua/src/lstring.c
diff --git a/src/optional/lua/src/lstring.h → src/lua/src/lstring.h b/src/optional/lua/src/lstring.h → src/lua/src/lstring.h
diff --git a/src/optional/lua/src/lstrlib.c → src/lua/src/lstrlib.c b/src/optional/lua/src/lstrlib.c → src/lua/src/lstrlib.c
diff --git a/src/optional/lua/src/ltable.c → src/lua/src/ltable.c b/src/optional/lua/src/ltable.c → src/lua/src/ltable.c
diff --git a/src/optional/lua/src/ltable.h → src/lua/src/ltable.h b/src/optional/lua/src/ltable.h → src/lua/src/ltable.h
diff --git a/src/optional/lua/src/ltablib.c → src/lua/src/ltablib.c b/src/optional/lua/src/ltablib.c → src/lua/src/ltablib.c
diff --git a/src/optional/lua/src/ltm.c → src/lua/src/ltm.c b/src/optional/lua/src/ltm.c → src/lua/src/ltm.c
diff --git a/src/optional/lua/src/ltm.h → src/lua/src/ltm.h b/src/optional/lua/src/ltm.h → src/lua/src/ltm.h
diff --git a/src/optional/lua/src/lua.c → src/lua/src/lua.c b/src/optional/lua/src/lua.c → src/lua/src/lua.c
diff --git a/src/optional/lua/src/lua.h → src/lua/src/lua.h b/src/optional/lua/src/lua.h → src/lua/src/lua.h
diff --git a/src/optional/lua/src/lua.hpp → src/lua/src/lua.hpp b/src/optional/lua/src/lua.hpp → src/lua/src/lua.hpp
diff --git a/src/optional/lua/src/luac.c → src/lua/src/luac.c b/src/optional/lua/src/luac.c → src/lua/src/luac.c
diff --git a/src/optional/lua/src/luaconf.h → src/lua/src/luaconf.h b/src/optional/lua/src/luaconf.h → src/lua/src/luaconf.h
diff --git a/src/optional/lua/src/lualib.h → src/lua/src/lualib.h b/src/optional/lua/src/lualib.h → src/lua/src/lualib.h
diff --git a/src/optional/lua/src/lundump.c → src/lua/src/lundump.c b/src/optional/lua/src/lundump.c → src/lua/src/lundump.c
diff --git a/src/optional/lua/src/lundump.h → src/lua/src/lundump.h b/src/optional/lua/src/lundump.h → src/lua/src/lundump.h
diff --git a/src/optional/lua/src/lutf8lib.c → src/lua/src/lutf8lib.c b/src/optional/lua/src/lutf8lib.c → src/lua/src/lutf8lib.c
diff --git a/src/optional/lua/src/lvm.c → src/lua/src/lvm.c b/src/optional/lua/src/lvm.c → src/lua/src/lvm.c
diff --git a/src/optional/lua/src/lvm.h → src/lua/src/lvm.h b/src/optional/lua/src/lvm.h → src/lua/src/lvm.h
diff --git a/src/optional/lua/src/lzio.c → src/lua/src/lzio.c b/src/optional/lua/src/lzio.c → src/lua/src/lzio.c
diff --git a/src/optional/lua/src/lzio.h → src/lua/src/lzio.h b/src/optional/lua/src/lzio.h → src/lua/src/lzio.h
diff --git a/test/iris_lua_demo.cpp b/test/iris_lua_demo.cpp
@@ -1,4 +1,4 @@
-#include "../src/optional/iris_lua.h"
+#include "../src/iris_lua.h"
 #include "../src/iris_common.inl"
 #include <map>
 #include <cstdio>