From 14f754f1608a0f8ca62ead485669d88cc651667d Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 5 Jul 2012 06:08:34 -0400
Subject: begin integrating building of llphysicsextensions from source here
 (incomplete)

---
 indra/newview/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c91d276c8f..f0045692c4 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -58,6 +58,7 @@ include_directories(
     ${LLINVENTORY_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLPHYSICSEXTENSIONS_INCLUDE_DIRS}
     ${LLPLUGIN_INCLUDE_DIRS}
     ${LLPRIMITIVE_INCLUDE_DIRS}
     ${LLRENDER_INCLUDE_DIRS}
-- 
cgit v1.3


From 21ee5f8d415920827a477ae236f30e7d09dc8e9f Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 5 Jul 2012 09:39:21 -0400
Subject: successful build with llphysicsextensions stub

---
 autobuild.xml                         | 8 ++++----
 indra/cmake/LLPhysicsExtensions.cmake | 2 ++
 indra/newview/CMakeLists.txt          | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'indra/newview')

diff --git a/autobuild.xml b/autobuild.xml
index fe8700e64b..60c7b4c118 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1158,11 +1158,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ea98ebb0babcf7018bf5c10996be178a</string>
+              <string>75b3266c3d51b6ae767158969a20a324</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120704.tar.bz2</string>
+              <string>file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120705.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -1186,11 +1186,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>eb016d162ac4714ebdfc3331ce080827</string>
+              <string>5e6db8ede04aeda9f508fe31df6500c9</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120704.tar.bz2</string>
+              <string>file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120705.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake
index c9812d06d6..224d7f9b45 100644
--- a/indra/cmake/LLPhysicsExtensions.cmake
+++ b/indra/cmake/LLPhysicsExtensions.cmake
@@ -15,10 +15,12 @@ if (HAVOK)
    include(Havok)
    use_prebuilt_binary(llphysicsextensions_source)
    set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src)
+   set(LLPHYSICSEXTENSIONS_LIBRARIES    llphysicsextensions)
 
 else (HAVOK)
    use_prebuilt_binary(llphysicsextensions_stub)
    set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub)
+   set(LLPHYSICSEXTENSIONS_LIBRARIES    llphysicsextensionsstub)
 
 endif (HAVOK)
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f0045692c4..590973c890 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1820,6 +1820,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${CRYPTO_LIBRARIES}
     ${LLLOGIN_LIBRARIES}
     ${LLPHYSICS_LIBRARIES}
+    ${LLPHYSICSEXTENSIONS_LIBRARIES}
     ${TCMALLOC_LIBRARIES}
     )
 
-- 
cgit v1.3


From 702e6815ed70cb210dc2a014237e0c15a2a69045 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 5 Jul 2012 12:16:48 -0400
Subject: partial changes for building with the llphysicsextensions source
 package

---
 indra/cmake/LLPhysicsExtensions.cmake | 2 --
 indra/llprimitive/CMakeLists.txt      | 2 ++
 indra/newview/CMakeLists.txt          | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake
index 224d7f9b45..72ac35e02b 100644
--- a/indra/cmake/LLPhysicsExtensions.cmake
+++ b/indra/cmake/LLPhysicsExtensions.cmake
@@ -25,5 +25,3 @@ else (HAVOK)
 endif (HAVOK)
 
 set(LLPHYSICSEXTENSIONS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/llphysicsextensions)
-
-add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions)
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index 7d0e313ff3..e4d9de7eb6 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -7,12 +7,14 @@ include(LLCommon)
 include(LLMath)
 include(LLMessage)
 include(LLXML)
+include(LLPhysicsExtensions)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
+    ${LLPHYSICSEXTENSIONS_INCLUDE_DIRS}
     ${LIBS_PREBUILT_DIR}/include/collada
     ${LIBS_PREBUILT_DIR}/include/collada/1.4
     )
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 590973c890..b5c64925c6 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -44,6 +44,8 @@ include(VisualLeakDetector)
 include(GLOD)
 include(CMakeCopyIfDifferent)
 
+add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions)
+
 include_directories(
     ${DBUSGLIB_INCLUDE_DIRS}
     ${JSONCPP_INCLUDE_DIR}
-- 
cgit v1.3