diff options
| author | Brad Linden <brad@lindenlab.com> | 2025-10-02 13:35:54 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2025-10-02 13:35:54 -0700 |
| commit | b314a0bb64e81e17cb5a4d4e9ea417fe4040d25f (patch) | |
| tree | 05377ace6d9eb6e7d047efeb162635951281fbb3 | |
| parent | fc41f57a06065957bc377d7a1716c5c04b8fec70 (diff) | |
new llphysicsextensions_source package that sets OSX_ARCHITECTURES properly
and should hopefully package llphysicsextensions_tpv successfully
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/autobuild.xml b/autobuild.xml index 280078b4c2..56831346c1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1439,11 +1439,11 @@ <key>creds</key> <string>github</string> <key>hash</key> - <string>1949ae355a70a4cbe2f0969de636680a0b5d7b15</string> + <string>fff82c79edb900c547c40dca9a0e3ebac5a8c7da</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/299453833</string> + <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/299858950</string> </map> <key>name</key> <string>common</string> diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 9e566096fc..0d50aeca82 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -74,9 +74,6 @@ if (NOT HAVOK_TPV) target_link_libraries(llphysicsextensions llrender ) if (DARWIN) target_compile_options( llphysicsextensions PRIVATE -Wno-unused-local-typedef) - - # TODO - move this into llphysicsextensions/CMakeLists.txt once I've proved it works - set_target_properties(llphysicsextensions PROPERTIES OSX_ARCHITECTURES "x86_64") endif (DARWIN) endif() endif (NOT HAVOK_TPV) |