CMake issues fixed

CMakeLists.txt

@@ -80,7 +80,6 @@ if(desktop)
         Core
         Gui
         Widgets
-        Multimedia
         Svg
     )
 

build/CMakeLists.txt

@@ -18,10 +18,6 @@ if(desktop)
         DESTINATION "${PLATFORM_PATH}/plugins"
     )
 
-    install(DIRECTORY ${QT_PLUGINS_DIR}/mediaservice
-        DESTINATION "${PLATFORM_PATH}/mediaservice"
-    )
-
     if(LINUX)
         install(DIRECTORY ${QT_PLUGINS_DIR}/xcbglintegrations
             DESTINATION "${PLATFORM_PATH}/xcbglintegrations"
@@ -45,8 +41,6 @@ if(desktop)
     set(QT_LIBS
         "Qt5Core"
         "Qt5Gui"
-        "Qt5Network"
-        "Qt5Multimedia"
         "Qt5Svg"
         "Qt5Widgets"
     )

builder/CMakeLists.txt

@@ -32,6 +32,7 @@ endif()
 add_definitions (
     -DCOMPANY_NAME="${COMPANY_NAME}"
     -DBUILDER_NAME="${BUILDER_NAME}"
+    -DPRODUCT_NAME="${PRODUCT_NAME}"
     -DSDK_VERSION="${SDK_VERSION}"
 )
 

modules/editor/CMakeLists.txt

@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.10)
 project(editor)
 
 add_subdirectory(grapheditor)
-add_subdirectory(iostools)
 add_subdirectory(motiontools)
 add_subdirectory(particletools)
 add_subdirectory(pipelinetools)

modules/editor/buildtools/CMakeLists.txt

@@ -6,8 +6,7 @@ file(GLOB ${PROJECT_NAME}_srcFiles
     "*.cpp"
     "converter/*.cpp"
     "*.qrc"
-    "*.h"
-
+    "*.h" 
 )
 
 set(${PROJECT_NAME}_incPaths
@@ -19,6 +18,8 @@ set(${PROJECT_NAME}_incPaths
     "../../../thirdparty/next/inc"
     "../../../thirdparty/next/inc/math"
     "../../../thirdparty/next/inc/core"
+    "../../../thirdparty/zlib/src"
+    "../../../thirdparty/minizip"
 )
 
 # This path is only needed on the BSDs
@@ -47,6 +48,8 @@ if (desktop)
     target_link_libraries(${PROJECT_NAME} PRIVATE
         next-editor
         engine-editor
+        zlib-editor
+        minizip
         Qt5::Gui
     )
 

modules/editor/motiontools/CMakeLists.txt

@@ -6,10 +6,12 @@ file(GLOB ${PROJECT_NAME}_srcFiles
     "*.cpp"
     "converter/*.cpp"
     "editor/*.cpp"
+    "editor/actions/*.cpp"
+    "editor/property/*.cpp"
 )
 
 set(${PROJECT_NAME}_incPaths
-    "editor"
+    "converter"
     "../../../engine/includes"
     "../../../engine/includes/resources"
     "../../../engine/includes/components"
@@ -32,12 +34,14 @@ endif()
 
 file(GLOB ${PROJECT_NAME}_ui
     "editor/*.ui"
+    "editor/property/*.ui"
 )
 
 file(GLOB MOC_HEADERS
     "*.h"
     "converter/*.h"
     "editor/*.h"
+    "editor/property/*.h"
 )
 
 QT5_WRAP_UI(UI_HEADERS ${${PROJECT_NAME}_ui})

modules/editor/texturetools/CMakeLists.txt

@@ -6,6 +6,7 @@ file(GLOB ${PROJECT_NAME}_srcFiles
     "*.cpp"
     "converter/*.cpp"
     "editor/*.cpp"
+    "editor/actions/*.cpp"
     "editor/tools/*.cpp"
 )
 
@@ -18,6 +19,8 @@ set(${PROJECT_NAME}_incPaths
     "../../../thirdparty/next/inc"
     "../../../thirdparty/next/inc/math"
     "../../../thirdparty/next/inc/core"
+    "../../../thirdparty/stb"
+    "../../../thirdparty/basisu"
 )
 
 # This path is only needed on the BSDs
@@ -48,6 +51,7 @@ if (desktop)
     target_link_libraries(${PROJECT_NAME} PRIVATE
         next-editor
         engine-editor
+        basisu
         Qt5::Core
         Qt5::Gui
         Qt5::Widgets

modules/media/CMakeLists.txt

@@ -21,6 +21,7 @@ set(${PROJECT_NAME}_incPaths
     "../../thirdparty/openal/include"
     "../../thirdparty/libogg/src"
     "../../thirdparty/libvorbis/src"
+    "../../thirdparty/miniaudio"
 )
 
 # find where OpenAL is installed on user's system
@@ -70,7 +71,6 @@ if(desktop)
         vorbisfile-editor
         Qt5::Core
         Qt5::Gui
-        Qt5::Multimedia
     )
     target_compile_definitions(${PROJECT_NAME}-editor PRIVATE
         SHARED_DEFINE

modules/renders/CMakeLists.txt

@@ -3,5 +3,5 @@ cmake_minimum_required(VERSION 3.10)
 project(renders)
 
 add_subdirectory(rendergl)
+add_subdirectory(rendervk)
 add_subdirectory(rendermt)
-add_subdirectory(rendervk)

modules/renders/rendermt/CMakeLists.txt

@@ -19,7 +19,7 @@ set(${PROJECT_NAME}_incPaths
     "../../../thirdparty/next/inc/core"
     "../../../thirdparty/glfw/include"
     "../../../thirdparty/glfm/include"
-    "../../../thirdparty/metal/metal-cpp",
+    "../../../thirdparty/metal/metal-cpp"
     "../../../thirdparty/metal/metal-cpp-extensions"
 )
 
@@ -97,4 +97,4 @@ install(TARGETS ${PROJECT_NAME}
     DESTINATION "${STATIC_PATH}"
 )
 
-endif() # APPLE
+endif() # APPLE

tests/CMakeLists.txt

@@ -22,14 +22,16 @@ set(${PROJECT_NAME}_incPaths
     "../modules/network/tests"
     "../modules/network/includes"
     "../modules/network/includes/objects"
+    "../modules/uikit/tests"
+    "../modules/uikit/includes"
 )
 
 # This path is only needed on the BSDs
 if(UNIX AND NOT APPLE AND NOT LINUX)
-	set(${PROJECT_NAME}_incPaths
-        ${${PROJECT_NAME}_incPaths}
-		"/usr/local/include"
-	)
+    set(${PROJECT_NAME}_incPaths
+    ${${PROJECT_NAME}_incPaths}
+        "/usr/local/include"
+    )
 endif()
 
 if (desktop)
@@ -40,7 +42,7 @@ if (desktop)
     target_link_libraries(${PROJECT_NAME} PRIVATE
         next-editor
         engine-editor
-        network-editor
+        uikit-editor
         GTest
     )
 

thirdparty/CMakeLists.txt

@@ -15,10 +15,11 @@ add_subdirectory(freetype)
 
 if(desktop)
     add_subdirectory(assimp)
+    add_subdirectory(basisu)
     add_subdirectory(spirvcross)
     add_subdirectory(glfw)
     add_subdirectory(gtest)
     add_subdirectory(poly2tri)
     add_subdirectory(syntaxhighlighting)
-	add_subdirectory(minizip)
+    add_subdirectory(minizip)
 endif()

thirdparty/basisu/CMakeLists.txt

@@ -0,0 +1,52 @@
+cmake_minimum_required(VERSION 3.10)
+
+project(basisu)
+
+set(${PROJECT_NAME}_incPaths
+    "encoder"
+)
+
+# This path is only needed on the BSDs
+if(UNIX AND NOT APPLE AND NOT LINUX)
+    set(${PROJECT_NAME}_incPaths
+        ${${PROJECT_NAME}_incPaths}
+        "/usr/local/include"
+    )
+endif()
+
+set(${PROJECT_NAME}_srcFiles
+    encoder/3rdparty/android_astc_decomp.cpp
+    encoder/3rdparty/tinyexr.cpp
+    encoder/basisu_astc_hdr_6x6_enc.cpp
+    encoder/basisu_astc_hdr_common.cpp
+    encoder/basisu_backend.cpp
+    encoder/basisu_basis_file.cpp
+    encoder/basisu_bc7enc.cpp
+    encoder/basisu_comp.cpp
+    encoder/basisu_enc.cpp
+    encoder/basisu_etc.cpp
+    encoder/basisu_frontend.cpp
+    encoder/basisu_gpu_texture.cpp
+    encoder/basisu_kernels_sse.cpp
+    encoder/basisu_opencl.cpp
+    encoder/basisu_pvrtc1_4.cpp
+    encoder/basisu_resample_filters.cpp
+    encoder/basisu_resampler.cpp
+    encoder/basisu_ssim.cpp
+    encoder/basisu_uastc_enc.cpp
+    encoder/basisu_uastc_hdr_4x4_enc.cpp
+    encoder/jpgd.cpp
+    encoder/pvpngreader.cpp
+    transcoder/basisu_transcoder.cpp
+    zstd/zstd.c
+)
+
+# Static Library
+add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_srcFiles})
+target_include_directories(${PROJECT_NAME} PRIVATE ${${PROJECT_NAME}_incPaths})
+set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "thirdparty")
+
+# Solve build error using Clang on BSDs
+if(UNIX AND NOT APPLE AND NOT LINUX)
+    target_compile_options(${PROJECT_NAME} PRIVATE -fPIC)
+endif()

thirdparty/next/CMakeLists.txt

@@ -10,12 +10,17 @@ file(GLOB ${PROJECT_NAME}_srcFiles
     "src/analytics/*.cpp"
 )
 
+file(GLOB ${PROJECT_NAME}_osFiles
+    "src/os/*.cpp"
+)
+
 set(${PROJECT_NAME}_incPaths
     "inc"
     "inc/core"
     "inc/math"
     "inc/anim"
     "inc/analytics"
+    "inc/os"
 )
 
 # This path is only needed on the BSDs
@@ -26,11 +31,11 @@ if(UNIX AND NOT APPLE AND NOT LINUX)
     )
 endif()
 
-source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${${PROJECT_NAME}_srcFiles})
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${${PROJECT_NAME}_srcFiles} ${${PROJECT_NAME}_osFiles})
 
 # Dynamic Library
 if(desktop)
-    add_library(${PROJECT_NAME}-editor SHARED ${${PROJECT_NAME}_srcFiles})
+    add_library(${PROJECT_NAME}-editor SHARED ${${PROJECT_NAME}_srcFiles} ${${PROJECT_NAME}_osFiles})
     target_compile_definitions(${PROJECT_NAME}-editor PRIVATE SHARED_DEFINE NEXT_LIBRARY)
     target_include_directories(${PROJECT_NAME}-editor PRIVATE ${${PROJECT_NAME}_incPaths})
 

thirdparty/syntaxhighlighting/CMakeLists.txt

@@ -50,5 +50,4 @@ endif()
 target_link_libraries(${PROJECT_NAME} PRIVATE
     Qt5::Core
     Qt5::Gui
-    Qt5::Network
 )

worldeditor/CMakeLists.txt

@@ -182,18 +182,18 @@ if (desktop)
     target_include_directories(${EDITOR_NAME} PRIVATE ${${PROJECT_NAME}_incPaths} ${CMAKE_CURRENT_BINARY_DIR})
 
     set_target_properties(${EDITOR_NAME} PROPERTIES
-            RUNTIME_OUTPUT_DIRECTORY_DEBUG "../${BIN_PATH}"
-            RUNTIME_OUTPUT_DIRECTORY_RELEASE "../${BIN_PATH}"
+        RUNTIME_OUTPUT_DIRECTORY_DEBUG "../${BIN_PATH}"
+        RUNTIME_OUTPUT_DIRECTORY_RELEASE "../${BIN_PATH}"
     )
 
     install(TARGETS ${EDITOR_NAME}
-            DESTINATION "${BIN_PATH}"
+        DESTINATION "${BIN_PATH}"
     )
 
     if(APPLE)
         install(FILES
-                "res/icons/thunder.icns"
-                DESTINATION "${BIN_PATH}/../Resources"
+            "res/icons/thunder.icns"
+            DESTINATION "${BIN_PATH}/../Resources"
         )
     endif()
 endif()