Skip to content

Commit 6486428

Browse files
EnterTheArcaneEnterTheArcane
committed
Revert back to platform native toolchains
1 parent 7bd9c9f commit 6486428

File tree

5 files changed

+104
-104
lines changed

5 files changed

+104
-104
lines changed

‎scripts/build/Platform/Android/build_config.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"COMMAND":"../Windows/build_ninja_windows.cmd",
3636
"PARAMETERS": {
3737
"CONFIGURATION":"debug",
38-
"OUTPUT_DIRECTORY":"build\\android",
39-
"CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"",
38+
"OUTPUT_DIRECTORY":"build/android",
39+
"CMAKE_OPTIONS":"-G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/Android/Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"",
4040
"CMAKE_LY_PROJECTS":"AutomatedTesting",
4141
"CMAKE_TARGET":"all",
4242
"CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
@@ -50,8 +50,8 @@
5050
"COMMAND":"../Windows/build_ninja_windows.cmd",
5151
"PARAMETERS": {
5252
"CONFIGURATION":"profile",
53-
"OUTPUT_DIRECTORY":"build\\android",
54-
"CMAKE_OPTIONS":"-G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"",
53+
"OUTPUT_DIRECTORY":"build/android",
54+
"CMAKE_OPTIONS":"-G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/Android/Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"",
5555
"CMAKE_LY_PROJECTS":"AutomatedTesting",
5656
"CMAKE_TARGET":"all",
5757
"CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
@@ -66,8 +66,8 @@
6666
"COMMAND":"../Windows/build_ninja_windows.cmd",
6767
"PARAMETERS": {
6868
"CONFIGURATION":"profile",
69-
"OUTPUT_DIRECTORY":"build\\android",
70-
"CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"!LY_NDK_DIR!\" -DLY_UNITY_BUILD=FALSE",
69+
"OUTPUT_DIRECTORY":"build/android",
70+
"CMAKE_OPTIONS":"-G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/Android/Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"!LY_NDK_DIR!\" -DLY_UNITY_BUILD=FALSE",
7171
"CMAKE_LY_PROJECTS":"AutomatedTesting",
7272
"CMAKE_TARGET":"all",
7373
"CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
@@ -82,12 +82,12 @@
8282
"COMMAND":"../Windows/build_asset_windows.cmd",
8383
"PARAMETERS": {
8484
"CONFIGURATION":"profile",
85-
"OUTPUT_DIRECTORY":"build\\windows",
85+
"OUTPUT_DIRECTORY":"build/windows",
8686
"CMAKE_OPTIONS":"-DCMAKE_SYSTEM_VERSION=10.0",
8787
"CMAKE_LY_PROJECTS":"AutomatedTesting",
8888
"CMAKE_TARGET":"AssetProcessorBatch",
8989
"CMAKE_NATIVE_BUILD_ARGS": "/m /nologo",
90-
"ASSET_PROCESSOR_BINARY": "bin\\profile\\AssetProcessorBatch.exe",
90+
"ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch.exe",
9191
"ASSET_PROCESSOR_OPTIONS": "--zeroAnalysisMode --ignoreFutureAssetDatabaseVersionError --regset=\"/Amazon/AssetProcessor/Settings/Exclude Android/pattern=.*/DiffuseGlobalIllumination/.*precompiledshader\"",
9292
"ASSET_PROCESSOR_PLATFORMS":"android"
9393
}
@@ -101,8 +101,8 @@
101101
"COMMAND":"../Windows/build_ninja_windows.cmd",
102102
"PARAMETERS": {
103103
"CONFIGURATION":"release",
104-
"OUTPUT_DIRECTORY":"build\\android",
105-
"CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"",
104+
"OUTPUT_DIRECTORY":"build/android",
105+
"CMAKE_OPTIONS":"-G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/Android/Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"",
106106
"CMAKE_LY_PROJECTS":"AutomatedTesting",
107107
"CMAKE_TARGET":"all",
108108
"CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
@@ -117,8 +117,8 @@
117117
"COMMAND":"../Windows/build_ninja_windows.cmd",
118118
"PARAMETERS": {
119119
"CONFIGURATION":"release",
120-
"OUTPUT_DIRECTORY":"build\\mono_android",
121-
"CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"!LY_NDK_DIR!\" -DLY_MONOLITHIC_GAME=TRUE",
120+
"OUTPUT_DIRECTORY":"build/mono_android",
121+
"CMAKE_OPTIONS":"-G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/Android/Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"!LY_NDK_DIR!\" -DLY_MONOLITHIC_GAME=TRUE",
122122
"CMAKE_LY_PROJECTS":"AutomatedTesting",
123123
"CMAKE_TARGET":"all",
124124
"CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
@@ -133,7 +133,7 @@
133133
"COMMAND":"gradle_windows.cmd",
134134
"PARAMETERS": {
135135
"CONFIGURATION":"profile",
136-
"OUTPUT_DIRECTORY":"build\\ad_grd",
136+
"OUTPUT_DIRECTORY":"build/ad_grd",
137137
"SIGN_APK": "false",
138138
"GRADLE_BUILD_CMD": "build",
139139
"ADDITIONAL_GENERATE_ARGS": ""
@@ -145,7 +145,7 @@
145145
"COMMAND":"build_and_run_unit_tests.cmd",
146146
"PARAMETERS": {
147147
"CONFIGURATION":"profile",
148-
"OUTPUT_DIRECTORY":"build\\android_unittest",
148+
"OUTPUT_DIRECTORY":"build/android_unittest",
149149
"GAME_PROJECT": "AutomatedTesting",
150150
"SIGN_APK": "true",
151151
"GRADLE_BUILD_CMD": "assemble",

‎scripts/build/Platform/Linux/build_config.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
"PARAMETERS": {
110110
"CONFIGURATION": "debug",
111111
"OUTPUT_DIRECTORY": "build/linux",
112-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
112+
"CMAKE_OPTIONS": "-G Ninja -DLY_PARALLEL_LINK_JOBS=4",
113113
"CMAKE_LY_PROJECTS": "AutomatedTesting",
114114
"CMAKE_TARGET": "all"
115115
}
@@ -139,7 +139,7 @@
139139
"PARAMETERS": {
140140
"CONFIGURATION": "profile",
141141
"OUTPUT_DIRECTORY": "build/linux_gcc",
142-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DLY_PARALLEL_LINK_JOBS=4 -DLY_GCC_BUILD_FOR_GCOV=OFF",
142+
"CMAKE_OPTIONS": "-G Ninja -DLY_UNITY_BUILD=FALSE -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DLY_PARALLEL_LINK_JOBS=4 -DLY_GCC_BUILD_FOR_GCOV=OFF",
143143
"CMAKE_LY_PROJECTS": "AutomatedTesting",
144144
"CMAKE_TARGET": "all",
145145
"LY_MIN_MEMORY_PER_CORE": "2097152"
@@ -154,7 +154,7 @@
154154
"PARAMETERS": {
155155
"CONFIGURATION": "profile",
156156
"OUTPUT_DIRECTORY": "build/linux",
157-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4" ,
157+
"CMAKE_OPTIONS": "-G Ninja -DLY_PARALLEL_LINK_JOBS=4" ,
158158
"CMAKE_LY_PROJECTS": "AutomatedTesting",
159159
"CMAKE_TARGET": "all"
160160
}
@@ -168,7 +168,7 @@
168168
"PARAMETERS": {
169169
"CONFIGURATION": "profile",
170170
"OUTPUT_DIRECTORY": "build/linux",
171-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
171+
"CMAKE_OPTIONS": "-G Ninja -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
172172
"CMAKE_LY_PROJECTS": "AutomatedTesting",
173173
"CMAKE_TARGET": "all"
174174
}
@@ -182,7 +182,7 @@
182182
"PARAMETERS": {
183183
"CONFIGURATION": "profile",
184184
"OUTPUT_DIRECTORY": "build/linux",
185-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DLY_STRIP_DEBUG_SYMBOLS=ON",
185+
"CMAKE_OPTIONS": "-G Ninja -DLY_PARALLEL_LINK_JOBS=4 -DLY_STRIP_DEBUG_SYMBOLS=ON",
186186
"CMAKE_LY_PROJECTS": "AutomatedTesting",
187187
"CMAKE_TARGET": "all",
188188
"CTEST_OPTIONS": "-E (o3de_repo|o3de_export_project|AZ::AssetProcessor.Tests) -L (SUITE_smoke|SUITE_main) -LE (REQUIRES_gpu) --no-tests=error -T Test",
@@ -199,7 +199,7 @@
199199
"PARAMETERS": {
200200
"CONFIGURATION": "profile",
201201
"OUTPUT_DIRECTORY": "build/linux_gcc",
202-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DLY_PARALLEL_LINK_JOBS=4 -DLY_GCC_BUILD_FOR_GCOV=ON",
202+
"CMAKE_OPTIONS": "-G Ninja -DLY_UNITY_BUILD=FALSE -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DLY_PARALLEL_LINK_JOBS=4 -DLY_GCC_BUILD_FOR_GCOV=ON",
203203
"CMAKE_LY_PROJECTS": "AutomatedTesting",
204204
"CMAKE_TARGET": "all",
205205
"CTEST_OPTIONS": "-L (SUITE_smoke|SUITE_main) -LE (REQUIRES_gpu) --no-tests=error -T Test",
@@ -214,7 +214,7 @@
214214
"PARAMETERS": {
215215
"CONFIGURATION": "profile",
216216
"OUTPUT_DIRECTORY": "build/linux",
217-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
217+
"CMAKE_OPTIONS": "-G Ninja -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
218218
"CMAKE_LY_PROJECTS": "AutomatedTesting",
219219
"CMAKE_TARGET": "all",
220220
"CTEST_OPTIONS": "-E (o3de_export_project) -L (SUITE_smoke|SUITE_main) -LE (REQUIRES_gpu) --no-tests=error -T Test",
@@ -228,7 +228,7 @@
228228
"PARAMETERS": {
229229
"CONFIGURATION": "profile",
230230
"OUTPUT_DIRECTORY": "build/linux",
231-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4",
231+
"CMAKE_OPTIONS": "-G Ninja -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4",
232232
"CMAKE_LY_PROJECTS": "AutomatedTesting",
233233
"CMAKE_TARGET": "all",
234234
"CTEST_OPTIONS": "-E (Gem::EMotionFX.Tests|AZ::AssetProcessor.Tests|AZ::AzToolsFramework.Tests) -L (SUITE_smoke|SUITE_main) -LE (REQUIRES_gpu) --no-tests=error -T Test --timeout 2500",
@@ -246,7 +246,7 @@
246246
"PARAMETERS": {
247247
"CONFIGURATION": "profile",
248248
"OUTPUT_DIRECTORY": "build/linux",
249-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DLY_STRIP_DEBUG_SYMBOLS=ON",
249+
"CMAKE_OPTIONS": "-G Ninja -DLY_PARALLEL_LINK_JOBS=4 -DLY_STRIP_DEBUG_SYMBOLS=ON",
250250
"CMAKE_LY_PROJECTS": "AutomatedTesting",
251251
"CMAKE_TARGET": "AssetProcessorBatch",
252252
"ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch",
@@ -263,7 +263,7 @@
263263
"PARAMETERS": {
264264
"CONFIGURATION": "profile",
265265
"OUTPUT_DIRECTORY": "build/linux",
266-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
266+
"CMAKE_OPTIONS": "-G Ninja -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
267267
"CMAKE_LY_PROJECTS": "AutomatedTesting",
268268
"CMAKE_TARGET": "AssetProcessorBatch",
269269
"ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch",
@@ -280,7 +280,7 @@
280280
"PARAMETERS": {
281281
"CONFIGURATION": "profile",
282282
"OUTPUT_DIRECTORY": "build/linux",
283-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4",
283+
"CMAKE_OPTIONS": "-G Ninja -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4",
284284
"CMAKE_LY_PROJECTS": "AutomatedTesting",
285285
"CMAKE_TARGET": "AssetProcessorBatch",
286286
"ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch",
@@ -310,7 +310,7 @@
310310
"PARAMETERS": {
311311
"CONFIGURATION": "profile",
312312
"OUTPUT_DIRECTORY": "build/linux",
313-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
313+
"CMAKE_OPTIONS": "-G Ninja -DLY_PARALLEL_LINK_JOBS=4",
314314
"CMAKE_LY_PROJECTS": "AutomatedTesting",
315315
"CMAKE_TARGET": "TEST_SUITE_awsi",
316316
"CTEST_OPTIONS": "-L (SUITE_awsi) --no-tests=error -T Test",
@@ -328,7 +328,7 @@
328328
"PARAMETERS": {
329329
"CONFIGURATION": "profile",
330330
"OUTPUT_DIRECTORY": "build/linux",
331-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
331+
"CMAKE_OPTIONS": "-G Ninja -DLY_PARALLEL_LINK_JOBS=4",
332332
"CMAKE_LY_PROJECTS": "AutomatedTesting",
333333
"CMAKE_TARGET": "TEST_SUITE_periodic",
334334
"CTEST_OPTIONS": "-L (SUITE_periodic) -LE (REQUIRES_gpu) --no-tests=error -T Test",
@@ -349,7 +349,7 @@
349349
"PARAMETERS": {
350350
"CONFIGURATION": "profile",
351351
"OUTPUT_DIRECTORY": "build/linux",
352-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
352+
"CMAKE_OPTIONS": "-G Ninja -DLY_PARALLEL_LINK_JOBS=4",
353353
"CMAKE_LY_PROJECTS": "AutomatedTesting",
354354
"CMAKE_TARGET": "all",
355355
"CTEST_OPTIONS": "-L (SUITE_sandbox) --no-tests=error -T Test",
@@ -367,7 +367,7 @@
367367
"PARAMETERS": {
368368
"CONFIGURATION": "profile",
369369
"OUTPUT_DIRECTORY": "build/linux",
370-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
370+
"CMAKE_OPTIONS": "-G Ninja -DLY_PARALLEL_LINK_JOBS=4",
371371
"CMAKE_LY_PROJECTS": "AutomatedTesting",
372372
"CMAKE_TARGET": "TEST_SUITE_benchmark",
373373
"CTEST_OPTIONS": "-L (SUITE_benchmark) -LE (REQUIRES_gpu) --no-tests=error -T Test",
@@ -385,7 +385,7 @@
385385
"PARAMETERS": {
386386
"CONFIGURATION": "release",
387387
"OUTPUT_DIRECTORY": "build/linux",
388-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
388+
"CMAKE_OPTIONS": "-G Ninja -DLY_PARALLEL_LINK_JOBS=4",
389389
"CMAKE_LY_PROJECTS": "AutomatedTesting",
390390
"CMAKE_TARGET": "all"
391391
}
@@ -400,7 +400,7 @@
400400
"PARAMETERS": {
401401
"CONFIGURATION": "release",
402402
"OUTPUT_DIRECTORY": "build/mono_linux",
403-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_MONOLITHIC_GAME=TRUE -DLY_PARALLEL_LINK_JOBS=4",
403+
"CMAKE_OPTIONS": "-G Ninja -DLY_MONOLITHIC_GAME=TRUE -DLY_PARALLEL_LINK_JOBS=4",
404404
"CMAKE_LY_PROJECTS": "AutomatedTesting",
405405
"CMAKE_TARGET": "all"
406406
}
@@ -411,7 +411,7 @@
411411
"PARAMETERS": {
412412
"CONFIGURATION": "profile",
413413
"OUTPUT_DIRECTORY": "build/linux",
414-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_STRIP_DEBUG_SYMBOLS=TRUE",
414+
"CMAKE_OPTIONS": "-G Ninja -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_STRIP_DEBUG_SYMBOLS=TRUE",
415415
"CMAKE_TARGET": "install"
416416
}
417417
},
@@ -424,7 +424,7 @@
424424
"PARAMETERS": {
425425
"CONFIGURATION": "release",
426426
"OUTPUT_DIRECTORY": "build/linux_mono",
427-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_MONOLITHIC_GAME=TRUE -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_STRIP_DEBUG_SYMBOLS=TRUE",
427+
"CMAKE_OPTIONS": "-G Ninja -DLY_MONOLITHIC_GAME=TRUE -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_STRIP_DEBUG_SYMBOLS=TRUE",
428428
"CMAKE_TARGET": "install"
429429
}
430430
},
@@ -437,7 +437,7 @@
437437
"PARAMETERS": {
438438
"CONFIGURATION": "profile",
439439
"OUTPUT_DIRECTORY": "build/android_api_mono",
440-
"CMAKE_OPTIONS":"-G 'Ninja Multi-Config' -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/Android/Toolchain_android.cmake -DLY_MONOLITHIC_GAME=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"${LY_NDK_DIR}\"",
440+
"CMAKE_OPTIONS":"-G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/Android/Toolchain_android.cmake -DLY_MONOLITHIC_GAME=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"${LY_NDK_DIR}\"",
441441
"CMAKE_TARGET": "install"
442442
}
443443
},
@@ -450,7 +450,7 @@
450450
"PARAMETERS": {
451451
"CONFIGURATION": "release",
452452
"OUTPUT_DIRECTORY": "build/android_api_mono",
453-
"CMAKE_OPTIONS":"-G 'Ninja Multi-Config' -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/Android/Toolchain_android.cmake -DLY_MONOLITHIC_GAME=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"${LY_NDK_DIR}\"",
453+
"CMAKE_OPTIONS":"-G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/Android/Toolchain_android.cmake -DLY_MONOLITHIC_GAME=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DANDROID_NATIVE_API_LEVEL=24 -DLY_NDK_DIR=\"${LY_NDK_DIR}\"",
454454
"CMAKE_TARGET": "install"
455455
}
456456
},
@@ -475,7 +475,7 @@
475475
"CONFIGURATION": "profile",
476476
"OUTPUT_DIRECTORY": "build/linux",
477477
"O3DE_PACKAGE_TYPE": "DEB",
478-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE -DO3DE_INSTALL_ENGINE_NAME=o3de-sdk -DLY_STRIP_DEBUG_SYMBOLS=TRUE",
478+
"CMAKE_OPTIONS": "-G Ninja -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE -DO3DE_INSTALL_ENGINE_NAME=o3de-sdk -DLY_STRIP_DEBUG_SYMBOLS=TRUE",
479479
"EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=TRUE -DLY_INSTALLER_DOWNLOAD_URL=${INSTALLER_DOWNLOAD_URL} -DLY_INSTALLER_LICENSE_URL=${INSTALLER_DOWNLOAD_URL}/license -DO3DE_INCLUDE_INSTALL_IN_PACKAGE=TRUE",
480480
"CPACK_OPTIONS": "-D CPACK_UPLOAD_URL=${CPACK_UPLOAD_URL}",
481481
"CMAKE_TARGET": "all"
@@ -510,7 +510,7 @@
510510
"COMMAND_CWD": "${WORKSPACE}/${PROJECT_REPOSITORY_NAME}",
511511
"CONFIGURATION": "profile",
512512
"OUTPUT_DIRECTORY": "build/linux",
513-
"CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DCMAKE_MODULE_PATH=${WORKSPACE}/o3de/install/cmake",
513+
"CMAKE_OPTIONS": "-G Ninja -DLY_PARALLEL_LINK_JOBS=4 -DCMAKE_MODULE_PATH=${WORKSPACE}/o3de/install/cmake",
514514
"CMAKE_TARGET": "all"
515515
}
516516
},

‎scripts/build/Platform/Mac/build_config.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"PARAMETERS": {
3939
"CONFIGURATION": "debug",
4040
"OUTPUT_DIRECTORY": "build/mac",
41-
"CMAKE_OPTIONS": "-G Ninja",
41+
"CMAKE_OPTIONS": "-G Xcode",
4242
"CMAKE_LY_PROJECTS": "AutomatedTesting",
4343
"CMAKE_TARGET": "all"
4444
}
@@ -52,7 +52,7 @@
5252
"PARAMETERS": {
5353
"CONFIGURATION": "profile",
5454
"OUTPUT_DIRECTORY": "build/mac",
55-
"CMAKE_OPTIONS": "-G Ninja",
55+
"CMAKE_OPTIONS": "-G Xcode",
5656
"CMAKE_LY_PROJECTS": "AutomatedTesting",
5757
"CMAKE_TARGET": "all"
5858
}
@@ -67,7 +67,7 @@
6767
"PARAMETERS": {
6868
"CONFIGURATION": "profile",
6969
"OUTPUT_DIRECTORY": "build/mac",
70-
"CMAKE_OPTIONS": "-G Ninja -DLY_UNITY_BUILD=FALSE",
70+
"CMAKE_OPTIONS": "-G Xcode -DLY_UNITY_BUILD=FALSE",
7171
"CMAKE_LY_PROJECTS": "AutomatedTesting",
7272
"CMAKE_TARGET": "all"
7373
}
@@ -82,7 +82,7 @@
8282
"PARAMETERS": {
8383
"CONFIGURATION": "profile",
8484
"OUTPUT_DIRECTORY": "build/mac",
85-
"CMAKE_OPTIONS": "-G Ninja",
85+
"CMAKE_OPTIONS": "-G Xcode",
8686
"CMAKE_LY_PROJECTS": "AutomatedTesting",
8787
"CMAKE_TARGET": "AssetProcessorBatch",
8888
"ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch",
@@ -99,7 +99,7 @@
9999
"PARAMETERS": {
100100
"CONFIGURATION": "profile",
101101
"OUTPUT_DIRECTORY": "build/mac",
102-
"CMAKE_OPTIONS": "-G Ninja",
102+
"CMAKE_OPTIONS": "-G Xcode",
103103
"CMAKE_LY_PROJECTS": "AutomatedTesting",
104104
"CMAKE_TARGET": "all",
105105
"CTEST_OPTIONS": "-L (SUITE_smoke|SUITE_main) -LE (REQUIRES_gpu) --no-tests=error",
@@ -116,7 +116,7 @@
116116
"PARAMETERS": {
117117
"CONFIGURATION": "profile",
118118
"OUTPUT_DIRECTORY": "build/mac",
119-
"CMAKE_OPTIONS": "-G Ninja",
119+
"CMAKE_OPTIONS": "-G Xcode",
120120
"CMAKE_LY_PROJECTS": "AutomatedTesting",
121121
"CMAKE_TARGET": "TEST_SUITE_periodic",
122122
"CTEST_OPTIONS": "-L (SUITE_periodic) -LE (REQUIRES_gpu)",
@@ -133,7 +133,7 @@
133133
"PARAMETERS": {
134134
"CONFIGURATION": "profile",
135135
"OUTPUT_DIRECTORY": "build/mac",
136-
"CMAKE_OPTIONS": "-G Ninja",
136+
"CMAKE_OPTIONS": "-G Xcode",
137137
"CMAKE_LY_PROJECTS": "AutomatedTesting",
138138
"CMAKE_TARGET": "TEST_SUITE_benchmark",
139139
"CTEST_OPTIONS": "-L (SUITE_benchmark) -LE (REQUIRES_gpu)",
@@ -150,7 +150,7 @@
150150
"PARAMETERS": {
151151
"CONFIGURATION": "release",
152152
"OUTPUT_DIRECTORY": "build/mac",
153-
"CMAKE_OPTIONS": "-G Ninja",
153+
"CMAKE_OPTIONS": "-G Xcode",
154154
"CMAKE_LY_PROJECTS": "AutomatedTesting",
155155
"CMAKE_TARGET": "all"
156156
}
@@ -165,7 +165,7 @@
165165
"PARAMETERS": {
166166
"CONFIGURATION": "release",
167167
"OUTPUT_DIRECTORY": "build/mono_mac",
168-
"CMAKE_OPTIONS": "-G Ninja -DLY_MONOLITHIC_GAME=TRUE",
168+
"CMAKE_OPTIONS": "-G Xcode -DLY_MONOLITHIC_GAME=TRUE",
169169
"CMAKE_LY_PROJECTS": "AutomatedTesting",
170170
"CMAKE_TARGET": "all"
171171
}
@@ -176,7 +176,7 @@
176176
"PARAMETERS": {
177177
"CONFIGURATION": "profile",
178178
"OUTPUT_DIRECTORY": "build/mac",
179-
"CMAKE_OPTIONS": "-G Ninja -DLY_DISABLE_TEST_MODULES=TRUE",
179+
"CMAKE_OPTIONS": "-G Xcode -DLY_DISABLE_TEST_MODULES=TRUE",
180180
"CMAKE_LY_PROJECTS": "",
181181
"CMAKE_TARGET": "install"
182182
}
@@ -210,7 +210,7 @@
210210
"COMMAND_CWD": "${WORKSPACE}/${PROJECT_REPOSITORY_NAME}",
211211
"CONFIGURATION": "profile",
212212
"OUTPUT_DIRECTORY": "build/mac",
213-
"CMAKE_OPTIONS": "-G Ninja -DCMAKE_MODULE_PATH=${WORKSPACE}/o3de/install/O3DE_SDK.app/Contents/Engine/cmake",
213+
"CMAKE_OPTIONS": "-G Xcode -DCMAKE_MODULE_PATH=${WORKSPACE}/o3de/install/O3DE_SDK.app/Contents/Engine/cmake",
214214
"CMAKE_LY_PROJECTS": "",
215215
"CMAKE_TARGET": "all"
216216
}

0 commit comments

Comments
 (0)