birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add linux equivalents for all the places that enumerate platforms (#3325)

Browse Source 
* Add linux equivalents for all the places that enumerate platforms

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix the AssetFileInfoListComparisonTest fixture to not hardcode the PC platform

Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
Chris Burel
2021-08-24 14:10:59 -07:00
committed by GitHub
parent b31d673de0
commit 86770deefa
13 changed files with 63 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp
+4
View File
@@ -74,6 +74,10 @@ namespace AssetBuilderSDK
{
return AssetBuilderSDK::Platform_PC;
}
if (azstricmp(newPlatformName, "linux") == 0)
{
return AssetBuilderSDK::Platform_LINUX;
}
if (azstricmp(newPlatformName, "android") == 0)
{
return AssetBuilderSDK::Platform_ANDROID;
Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
+5 -4
View File
@@ -144,15 +144,16 @@ namespace AssetBuilderSDK
{
Platform_NONE = 0x00,
Platform_PC = 0x01,
Platform_ANDROID = 0x02,
Platform_IOS = 0x04,
Platform_MAC = 0x08,
Platform_LINUX = 0x02,
Platform_ANDROID = 0x04,
Platform_IOS = 0x08,
Platform_MAC = 0x10,
Platform_PROVO = 0x20,
Platform_SALEM = 0x40,
Platform_JASPER = 0x80,
//! if you add a new platform entry to this enum, you must add it to allplatforms as well otherwise that platform would not be considered valid.
AllPlatforms = Platform_PC | Platform_ANDROID | Platform_IOS | Platform_MAC | Platform_PROVO | Platform_SALEM | Platform_JASPER
AllPlatforms = Platform_PC | Platform_LINUX | Platform_ANDROID | Platform_IOS | Platform_MAC | Platform_PROVO | Platform_SALEM | Platform_JASPER
};
#endif // defined(ENABLE_LEGACY_PLATFORMFLAGS_SUPPORT)
//! Map data structure to holder parameters that are passed into a job for ProcessJob requests.
Code/Tools/AssetProcessor/testdata/config_regular/AssetProcessorPlatformConfig.setreg
Vendored
+3
View File
@@ -14,6 +14,9 @@
"Platform server": {
"tags": "server"
},
"Platform linux": {
"tags": "tools,renderer"
},
"Platforms": {
"android": "enabled",
"server": "enabled"
Code/Tools/AssetProcessor/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.setreg
Vendored
+4 -1
View File
@@ -14,6 +14,9 @@
"Platform mac": {
"tags": "tools,renderer"
},
"Platform linux": {
"tags": "tools,renderer"
},
"Platform server": {
"tags": "server"
},
@@ -110,4 +113,4 @@
}
}
}
}
}