update wwise archive module

WinterPu · Dec 13, 2024 · b0a1f24 · b0a1f24
1 parent f70b1a4
commit b0a1f24
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/Platform/Android.py b/Platform/Android.py
@@ -151,20 +151,33 @@ def Package_Wwise(self):
         PrintStageLog("Android - Package_Wwise Build Complete")
 
         ## Archive
-        ## Final Product 
+        ## Final Product
+
+
+        path_Android_output_root_path = ""
+
+        bneed_to_change_root_path = SystemHelper.Get().GetHostPlatform() == SystemHelper.Win_HostName()
+        if bneed_to_change_root_path:
+            ## this should be defined in wp.py scripts in Wwise base folder 
+            path_Android_output_root_path = Path("D:/WwiseAndroidOutput")
+
+
         for one_config in list_config:
             for one_arch in list_arch:
                 OneArchiveInfo = ArchiveInfo_WwisePlugin(
                     WPMHelper.Get().GetName_WwisePluginName(),
                     WPMHelper.Get().GetVer_Wwise(),
-                    SystemHelper.IOS_TargetName(),
+                    SystemHelper.Android_TargetName(),
                     one_config,
                     one_arch
 
                 )
                 extension = "so"
                 name_final_product = OneArchiveInfo.GetArchiveName()   + "." +  extension
-                path_target_archive_file = WPMHelper.Get().GetPath_WwiseSDKBase() / "Android_" + one_arch / one_config / "lib" / name_final_product
+                path_target_archive_file = WPMHelper.Get().GetPath_WwiseSDKBase() / ("Android_" + one_arch) / one_config / "lib" / name_final_product
+                if bneed_to_change_root_path:
+                    path_target_archive_file = path_Android_output_root_path / one_config / one_arch / name_final_product
+
                 PrintWarn("Src Wwise Final Product [%s]" % path_target_archive_file)
                 bshould_clean_others_when_archving = False
                 ArchiveManager.Get().ArchiveBuild(path_target_archive_file,OneArchiveInfo,bshould_clean_others_when_archving,extension)

diff --git a/Platform/Windows.py b/Platform/Windows.py
@@ -129,24 +129,28 @@ def Package_Wwise(self):
         ## Final Product 
         for one_config in list_config:
             for one_toolset in toolset:
+                if one_toolset in not_build_black_list:
+                    PrintLog("Skip Archive - %s" % one_toolset)
+                    continue
+
                 OneArchiveInfo = ArchiveInfo_WwisePlugin(
                     WPMHelper.Get().GetName_WwisePluginName(),
                     WPMHelper.Get().GetVer_Wwise(),
-                    SystemHelper.Mac_TargetName(),
+                    SystemHelper.Win64_TargetName(),
                     one_config,
                     arch,
                     one_toolset
                 )
                 extension = "dll"
                 name_final_product = OneArchiveInfo.GetArchiveName()   + "."  + extension
-                path_target_archive_file = WPMHelper.Get().GetPath_WwiseSDKBase() / OneArchiveInfo.GetArchiveSubDirBasedOnInfo() / "bin" / name_final_product
+                path_target_archive_file = WPMHelper.Get().GetPath_WwiseSDKBase() / ( arch + "_" + one_toolset) / one_config / "bin" / name_final_product
                 PrintWarn("Src Wwise Final Product [%s]" % path_target_archive_file)
                 bshould_clean_others_when_archving = False
                 ArchiveManager.Get().ArchiveBuild(path_target_archive_file,OneArchiveInfo,bshould_clean_others_when_archving,extension)
 
                 extension = "lib"
                 name_final_product = OneArchiveInfo.GetArchiveName()  + "."   + extension
-                path_target_archive_file = WPMHelper.Get().GetPath_WwiseSDKBase() /OneArchiveInfo.GetArchiveSubDirBasedOnInfo() / "bin" / name_final_product
+                path_target_archive_file = WPMHelper.Get().GetPath_WwiseSDKBase() / ( arch + "_" + one_toolset) / one_config  / "bin" / name_final_product
                 PrintWarn("Src Wwise Final Product [%s]" % path_target_archive_file)
                 bshould_clean_others_when_archving = False
                 ArchiveManager.Get().ArchiveBuild(path_target_archive_file,OneArchiveInfo,bshould_clean_others_when_archving,extension)