Skip to content

Commit 25d44ba

Browse files
committed
Merge pull request #12 from awslabs/FB-3rdPartyUpdate
Transition from MINIMIZE_SIZE to ENABLE_UNITY_BUILD; disable SIMPLE_I…
2 parents de9dccc + 9fb82fd commit 25d44ba

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

scripts/build_3rdparty.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def GetPlatformBuildTargets():
5151
'cmake_params' : "-DSTATIC_LINKING=1",
5252
'build_params' : [ "-p:Configuration=Release" ],
5353
'config' : 'Release' } },
54-
'global_cmake_params' : "-G \"Visual Studio 12 Win64\" -DCUSTOM_MEMORY_MANAGEMENT=1 -DGENERATE_VERSION_INFO=0 -DCMAKE_CONFIGURATION_TYPES=\"Debug;Release;MinSizeRel;RelWithDebInfo\" -DCMAKE_CXX_FLAGS_DEBUGOPT=\"\" -DCMAKE_EXE_LINKER_FLAGS_DEBUGOPT=\"\" -DCMAKE_SHARED_LINKER_FLAGS_DEBUGOPT=\"\"" },
54+
'global_cmake_params' : "-G \"Visual Studio 12 Win64\" -DCUSTOM_MEMORY_MANAGEMENT=1 -DGENERATE_VERSION_INFO=0 -DSIMPLE_INSTALL=OFF -DENABLE_UNITY_BUILD=ON -DCMAKE_CONFIGURATION_TYPES=\"Debug;Release;MinSizeRel;RelWithDebInfo\" -DCMAKE_CXX_FLAGS_DEBUGOPT=\"\" -DCMAKE_EXE_LINKER_FLAGS_DEBUGOPT=\"\" -DCMAKE_SHARED_LINKER_FLAGS_DEBUGOPT=\"\"" },
5555
'Android' : { 'buildPlatforms' : [ 'Linux' ],
5656
'configs' : { 'DebugDynamic' : { 'directory' : '_build_android_dynamic_debug',
5757
'cmake_params' : "-DSTATIC_LINKING=0 -DANDROID_STL=gnustl_shared -DCMAKE_BUILD_TYPE=Debug",
@@ -71,12 +71,13 @@ def GetPlatformBuildTargets():
7171
'config' : 'Release' } },
7272
'global_cmake_params' : "-DSIMPLE_INSTALL=OFF " \
7373
"-DCUSTOM_MEMORY_MANAGEMENT=1 " \
74-
"-DGENERATE_VERSION_INFO=0" \
74+
"-DGENERATE_VERSION_INFO=0 " \
75+
"-DSIMPLE_INSTALL=OFF " \
76+
"-DENABLE_UNITY_BUILD=ON " \
7577
"-DANDROID_STL_FORCE_FEATURES=OFF " \
7678
"-DTARGET_ARCH=ANDROID " \
7779
"-DANDROID_ABI=armeabi-v7a " \
78-
"-DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 " \
79-
"-DMINIMIZE_SIZE=ON" },
80+
"-DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 "},
8081
'Linux' : { 'buildPlatforms' : [ 'Linux' ],
8182
'configs' : { 'DebugDynamic' : { 'directory' : '_build_linux_dynamic_debug',
8283
'cmake_params' : "-DSTATIC_LINKING=0 -DCMAKE_BUILD_TYPE=Debug",
@@ -94,7 +95,7 @@ def GetPlatformBuildTargets():
9495
'cmake_params' : "-DSTATIC_LINKING=1 -DCMAKE_BUILD_TYPE=Release",
9596
'build_params' : [],
9697
'config' : 'Release' } },
97-
'global_cmake_params' : "-DSIMPLE_INSTALL=OFF -DCUSTOM_MEMORY_MANAGEMENT=1 -DGENERATE_VERSION_INFO=0 -DMINIMIZE_SIZE=ON" },
98+
'global_cmake_params' : "-DSIMPLE_INSTALL=OFF -DCUSTOM_MEMORY_MANAGEMENT=1 -DGENERATE_VERSION_INFO=0 -DENABLE_UNITY_BUILD=ON" },
9899
'Darwin' : { 'buildPlatforms' : [ 'Darwin' ],
99100
'configs' : { 'DebugDynamic' : { 'directory' : '_build_darwin_dynamic_debug',
100101
'cmake_params' : "-DSTATIC_LINKING=0 -DCMAKE_BUILD_TYPE=Debug",

0 commit comments

Comments
 (0)