Skip to content
Snippets Groups Projects
Commit f9d92944 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

DRTVWR-418: Merge Callum's KDU update

parents 7e8e86dc 7b2cf53f
No related branches found
No related tags found
No related merge requests found
...@@ -3288,7 +3288,7 @@ ...@@ -3288,7 +3288,7 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string> <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
<string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string> <string>-DADDRESS_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string> <string>-DINSTALL_PROPRIETARY=TRUE</string>
</array> </array>
...@@ -3309,7 +3309,7 @@ ...@@ -3309,7 +3309,7 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string> <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
<string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string> <string>-DADDRESS_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string> <string>-DINSTALL_PROPRIETARY=FALSE</string>
</array> </array>
...@@ -3329,7 +3329,7 @@ ...@@ -3329,7 +3329,7 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-DCMAKE_BUILD_TYPE:STRING=Release</string> <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
<string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string> <string>-DADDRESS_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string> <string>-DINSTALL_PROPRIETARY=TRUE</string>
</array> </array>
...@@ -3350,7 +3350,7 @@ ...@@ -3350,7 +3350,7 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-DCMAKE_BUILD_TYPE:STRING=Release</string> <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
<string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string> <string>-DADDRESS_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string> <string>-DINSTALL_PROPRIETARY=FALSE</string>
</array> </array>
...@@ -3615,7 +3615,7 @@ ...@@ -3615,7 +3615,7 @@
<key>windows</key> <key>windows</key>
<map> <map>
<key>build_directory</key> <key>build_directory</key>
<string>build-vc120-$AUTOBUILD_ADDRSIZE</string> <string>build-vc120-32</string>
<key>configurations</key> <key>configurations</key>
<map> <map>
<key>RelWithDebInfo</key> <key>RelWithDebInfo</key>
...@@ -3631,7 +3631,7 @@ ...@@ -3631,7 +3631,7 @@
<key>options</key> <key>options</key>
<array> <array>
<string>/build</string> <string>/build</string>
<string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string> <string>RelWithDebInfo|Win32</string>
</array> </array>
</map> </map>
<key>configure</key> <key>configure</key>
...@@ -3643,7 +3643,7 @@ ...@@ -3643,7 +3643,7 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-G</string> <string>-G</string>
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> <string>Visual Studio 12</string>
</array> </array>
</map> </map>
<key>default</key> <key>default</key>
...@@ -3664,7 +3664,7 @@ ...@@ -3664,7 +3664,7 @@
<key>options</key> <key>options</key>
<array> <array>
<string>/p:Configuration=RelWithDebInfo</string> <string>/p:Configuration=RelWithDebInfo</string>
<string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string> <string>/p:Platform=Win32</string>
<string>/t:Build</string> <string>/t:Build</string>
<string>/p:useenv=true</string> <string>/p:useenv=true</string>
<string>/verbosity:minimal</string> <string>/verbosity:minimal</string>
...@@ -3681,7 +3681,7 @@ ...@@ -3681,7 +3681,7 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-G</string> <string>-G</string>
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> <string>Visual Studio 12</string>
<string>-DUNATTENDED:BOOL=ON</string> <string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string> <string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string> <string>-DUSE_KDU=FALSE</string>
...@@ -3703,7 +3703,7 @@ ...@@ -3703,7 +3703,7 @@
<key>options</key> <key>options</key>
<array> <array>
<string>/build</string> <string>/build</string>
<string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string> <string>Release|Win32</string>
</array> </array>
</map> </map>
<key>configure</key> <key>configure</key>
...@@ -3715,7 +3715,7 @@ ...@@ -3715,7 +3715,7 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-G</string> <string>-G</string>
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> <string>Visual Studio 12</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -3734,7 +3734,7 @@ ...@@ -3734,7 +3734,7 @@
<key>options</key> <key>options</key>
<array> <array>
<string>/p:Configuration=Release</string> <string>/p:Configuration=Release</string>
<string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string> <string>/p:Platform=Win32</string>
<string>/t:Build</string> <string>/t:Build</string>
<string>/p:useenv=true</string> <string>/p:useenv=true</string>
<string>/verbosity:minimal</string> <string>/verbosity:minimal</string>
...@@ -3751,7 +3751,7 @@ ...@@ -3751,7 +3751,7 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-G</string> <string>-G</string>
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> <string>Visual Studio 12</string>
<string>-DUNATTENDED:BOOL=ON</string> <string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string> <string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string> <string>-DUSE_KDU=FALSE</string>
......
...@@ -26,11 +26,6 @@ ...@@ -26,11 +26,6 @@
#include "linden_common.h" #include "linden_common.h"
// based on this KDU support group posting:
// https://groups.yahoo.com/neo/groups/kakadu_jpeg2000/conversations/messages/6691
// Defining this values seems to fix the linker error that appeared with the 7.8 release
#define CORESYS_IMPORTS
#include "llimagej2ckdu.h" #include "llimagej2ckdu.h"
#include "lltimer.h" #include "lltimer.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment