Ver Fonte

Update CMakeLists and remove old files

puvvadar há 4 anos atrás
pai
commit
213d171e72

+ 15 - 39
Gem/Code/CMakeLists.txt

@@ -40,7 +40,6 @@ ly_add_target(
 ly_add_target(
     NAME NetSoakTest ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
     NAMESPACE Gem
-    OUTPUT_NAME Gem.NetSoakTest.5111dee500ed4812a7905093a73d3837.v0.1.0
     FILES_CMAKE
         netsoaktest_shared_files.cmake
     INCLUDE_DIRECTORIES
@@ -53,48 +52,25 @@ ly_add_target(
             Gem::NetSoakTest.Static
 )
 
+# if enabled, NetSoakTest is used by all kinds of applications
+ly_create_alias(NAME NetSoakTest.Clients  NAMESPACE Gem TARGETS Gem::NetSoakTest)
+ly_create_alias(NAME NetSoakTest.Servers  NAMESPACE Gem TARGETS Gem::NetSoakTest)
+
 ################################################################################
 # Gem dependencies
 ################################################################################
 
-if(PAL_TRAIT_BUILD_HOST_TOOLS)
-    ly_add_project_dependencies(
-        PROJECT_NAME
-            NetSoakTest
-        TARGETS
-            AssetBuilder
-            AssetProcessor
-            AssetProcessorBatch
-            Editor
-        DEPENDENCIES_FILES
-            tool_dependencies.cmake
-    )
-endif()
+# The GameLauncher uses "Clients" gem variants:
+ly_enable_gems(PROJECT_NAME NetSoakTest GEM_FILE enabled_gems.cmake
+    TARGETS NetSoakTest.GameLauncher
+    VARIANTS Clients)
 
+# If we build a server, then apply the gems to the server
 if(PAL_TRAIT_BUILD_SERVER_SUPPORTED)
-    ly_add_target(
-        NAME NetSoakTest.Server ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
-        NAMESPACE Gem
-        OUTPUT_NAME Gem.NetSoakTest.Server.5111dee500ed4812a7905093a73d3837.v0.1.0
-        FILES_CMAKE
-            netsoaktest_shared_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Source
-                .
-        BUILD_DEPENDENCIES
-            PRIVATE
-                Gem::NetSoakTest.Static
-    )
-
-    ly_add_project_dependencies(
-        PROJECT_NAME
-            NetSoakTest
-        TARGETS
-            NetSoakTest.ServerLauncher
-        DEPENDENCIES_FILES
-            runtime_dependencies.cmake
-    )
+    # if we're making a server, then add the "Server" gem variants to it:
+    ly_enable_gems(PROJECT_NAME NetSoakTest GEM_FILE enabled_gems.cmake
+        TARGETS NetSoakTest.ServerLauncher
+        VARIANTS Servers)
+    
     set_property(GLOBAL APPEND PROPERTY LY_LAUNCHER_SERVER_PROJECTS NetSoakTest)
-
-endif()
+endif()

+ 0 - 14
Gem/Code/netsoaktest_ios_files.cmake

@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ../Resources/IOSLauncher/Info.plist
-)

+ 0 - 16
Gem/Code/runtime_dependencies.cmake

@@ -1,16 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(GEM_DEPENDENCIES
-    Gem::Atom_AtomBridge
-    Gem::NetSoakTest
-    Gem::Multiplayer
-)

+ 0 - 24
Gem/Code/tool_dependencies.cmake

@@ -1,24 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-# Extracted from Editor.xml
-set(GEM_DEPENDENCIES
-    Gem::NetSoakTest
-    Gem::Multiplayer
-    Gem::Atom_AtomBridge.Editor
-    Gem::LyShine.Editor
-    Gem::Maestro.Editor
-    Gem::SceneProcessing.Editor
-    Gem::ImageProcessingAtom.Editor
-    Gem::LmbrCentral.Editor
-    Gem::TextureAtlas.Editor
-    Gem::Camera.Editor
-)

+ 2 - 2
Gem/Resources/GameSDK.ico

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61efd8df621780af995fc1250918df5e00364ff00f849bef67702cd4b0a152e1
-size 65537
+oid sha256:d717f77fe01f45df934a61bbc215e5322447d21e16f3cebcf2a02f148178f266
+size 106449