diff options
| -rw-r--r-- | autobuild.xml | 26 | ||||
| -rw-r--r-- | indra/llkdu/llimagej2ckdu.cpp | 5 |
2 files changed, 13 insertions, 18 deletions
diff --git a/autobuild.xml b/autobuild.xml index 251e9b6468..9925730e4a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3288,7 +3288,7 @@ <key>options</key> <array> <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>-DINSTALL_PROPRIETARY=TRUE</string> </array> @@ -3309,7 +3309,7 @@ <key>options</key> <array> <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>-DINSTALL_PROPRIETARY=FALSE</string> </array> @@ -3329,7 +3329,7 @@ <key>options</key> <array> <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>-DINSTALL_PROPRIETARY=TRUE</string> </array> @@ -3350,7 +3350,7 @@ <key>options</key> <array> <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>-DINSTALL_PROPRIETARY=FALSE</string> </array> @@ -3615,7 +3615,7 @@ <key>windows</key> <map> <key>build_directory</key> - <string>build-vc120-$AUTOBUILD_ADDRSIZE</string> + <string>build-vc120-32</string> <key>configurations</key> <map> <key>RelWithDebInfo</key> @@ -3631,7 +3631,7 @@ <key>options</key> <array> <string>/build</string> - <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string> + <string>RelWithDebInfo|Win32</string> </array> </map> <key>configure</key> @@ -3643,7 +3643,7 @@ <key>options</key> <array> <string>-G</string> - <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> + <string>Visual Studio 12</string> </array> </map> <key>default</key> @@ -3664,7 +3664,7 @@ <key>options</key> <array> <string>/p:Configuration=RelWithDebInfo</string> - <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string> + <string>/p:Platform=Win32</string> <string>/t:Build</string> <string>/p:useenv=true</string> <string>/verbosity:minimal</string> @@ -3681,7 +3681,7 @@ <key>options</key> <array> <string>-G</string> - <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> + <string>Visual Studio 12</string> <string>-DUNATTENDED:BOOL=ON</string> <string>-DINSTALL_PROPRIETARY=FALSE</string> <string>-DUSE_KDU=FALSE</string> @@ -3703,7 +3703,7 @@ <key>options</key> <array> <string>/build</string> - <string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string> + <string>Release|Win32</string> </array> </map> <key>configure</key> @@ -3715,7 +3715,7 @@ <key>options</key> <array> <string>-G</string> - <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> + <string>Visual Studio 12</string> </array> </map> <key>name</key> @@ -3734,7 +3734,7 @@ <key>options</key> <array> <string>/p:Configuration=Release</string> - <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string> + <string>/p:Platform=Win32</string> <string>/t:Build</string> <string>/p:useenv=true</string> <string>/verbosity:minimal</string> @@ -3751,7 +3751,7 @@ <key>options</key> <array> <string>-G</string> - <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> + <string>Visual Studio 12</string> <string>-DUNATTENDED:BOOL=ON</string> <string>-DINSTALL_PROPRIETARY=FALSE</string> <string>-DUSE_KDU=FALSE</string> diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp index 0540e55e07..cb29da8f5f 100644 --- a/indra/llkdu/llimagej2ckdu.cpp +++ b/indra/llkdu/llimagej2ckdu.cpp @@ -26,11 +26,6 @@ #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 "lltimer.h" |