Moving Vendor code to ThirdParty, adding Toolbox and CLI projects

Source/AtomicCLI/AtomicCLI.cpp

@@ -0,0 +1,27 @@
+
+#include <Atomic/Core/ProcessUtils.h>
+
+using namespace Atomic;
+
+void Run(const Vector<String>& arguments)
+{
+    if (arguments.Size() < 2)
+    {
+
+    }
+
+}
+
+int main(int argc, char** argv)
+{
+    Vector<String> arguments;
+    
+#ifdef ATOMIC_PLATFORM_WINDOWS
+    arguments = ParseArguments(GetCommandLineW());
+#else
+    arguments = ParseArguments(argc, argv);
+#endif
+    
+    Run(arguments);
+    return 0;
+}

Source/AtomicCLI/CMakeLists.txt

@@ -0,0 +1,7 @@
+
+
+add_executable(atomic-cli AtomicCLI.cpp)
+
+target_link_libraries(atomic-cli ${ATOMIC_LINK_LIBRARIES})
+
+

Source/AtomicEditor/CMakeLists.txt

@@ -1,17 +1,16 @@
 include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty/rapidjson/include
                      ${CMAKE_SOURCE_DIR}/Source/ThirdParty
-                     ${CMAKE_CURRENT_SOURCE_DIR}/Vendor/nativefiledialog
-                     ${CMAKE_CURRENT_SOURCE_DIR}/Vendor/Poco/Foundation/include)
+                     ${CMAKE_SOURCE_DIR}/Source/ThirdParty/Poco/Foundation/include
+                     ${CMAKE_SOURCE_DIR}/Source/ThirdParty/nativefiledialog)
+
 
 file (GLOB_RECURSE SOURCE_FILES Source/*.cpp Source/*.h)
 
 add_definitions(-DPOCO_NO_AUTOMATIC_LIBS)
 
-set (SOURCE_FILES ${SOURCE_FILES} Vendor/nativefiledialog/nfd_common.c)
-
 if (APPLE)
     set (EXE_TYPE MACOSX_BUNDLE)
-    set (SOURCE_FILES ${SOURCE_FILES} Source/Build/BuildIOSUtils.mm Vendor/nativefiledialog/nfd_cocoa.mm Vendor/nativefiledialog/nfd.h)
+    set (SOURCE_FILES ${SOURCE_FILES} Source/Build/BuildIOSUtils.mm)
 
     #ICNS
     set(MACOSX_BUNDLE_ICON_FILE Atomic.icns)
@@ -25,11 +24,9 @@ else()
     set (SOURCE_FILES ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/CMake/Modules/Atomic.rc)
 endif(APPLE)
 
-add_subdirectory(Vendor)
-
 add_executable(AtomicEditor ${EXE_TYPE} ${SOURCE_FILES} ${ATOMIC_EDITOR_ICON})
 
-target_link_libraries(AtomicEditor ${ATOMIC_LINK_LIBRARIES} AtomicJS Poco)
+target_link_libraries(AtomicEditor ${ATOMIC_LINK_LIBRARIES} AtomicJS Poco nativefiledialog)
 
 if (APPLE)    
     set (TARGET_PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.template)

Source/AtomicEditor/Vendor/CMakeLists.txt

@@ -1,6 +0,0 @@
-
-add_subdirectory(Poco)
-
-if (MSVC)
-    add_subdirectory(libcurl)
-endif()

Source/CMakeLists.txt

@@ -5,6 +5,8 @@ add_subdirectory(AtomicJS)
 add_subdirectory(AtomicPlayer)
 
 if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)    
+	add_subdirectory(AtomicToolbox)
+	add_subdirectory(AtomicCLI)
     add_subdirectory(AtomicEditor)
     add_subdirectory(Tools)
 endif()

Source/ThirdParty/CMakeLists.txt

@@ -24,6 +24,8 @@ if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)
     add_subdirectory(LibCpuId)
     add_subdirectory(SQLite)
     add_subdirectory(TurboBadger)    
+    add_subdirectory(Poco)
+    add_subdirectory(nativefiledialog)
 endif ()
 
 if (APPLE AND NOT IOS)
@@ -31,5 +33,6 @@ if (APPLE AND NOT IOS)
 endif()
 
 if (MSVC)
+	add_subdirectory(libcurl)
     add_subdirectory(MojoShader)
-endif()
+endif()

Source/AtomicEditor/Vendor/Poco/CMakeLists.txt → Source/ThirdParty/Poco/CMakeLists.txt

@@ -1,6 +1,8 @@
 
 add_definitions(-DHAVE_STDINT_H -DPOCO_STATIC -DPOCO_NO_AUTOMATIC_LIBS)
 
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/Foundation/include)
+
 set (SOURCE_FILES
     Foundation/src/Pipe.cpp
     Foundation/src/Process.cpp
@@ -178,4 +180,4 @@ set (SOURCE_FILES
     Foundation/src/trees.c
     Foundation/src/zutil.c )
 
-add_library(Poco ${SOURCE_FILES})
+add_library(Poco ${SOURCE_FILES})