diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/OpenJPEG.cmake | 4 | ||||
| -rw-r--r-- | indra/llimagej2coj/llimagej2coj.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index e2647f6b98..e121328d64 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -37,7 +37,7 @@ if(WINDOWS) set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(release_files - openjp2.dll + openjpeg.dll libapr-1.dll libaprutil-1.dll libapriconv-1.dll diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake index 965384f5e0..bf0bde2ba7 100644 --- a/indra/cmake/OpenJPEG.cmake +++ b/indra/cmake/OpenJPEG.cmake @@ -12,8 +12,8 @@ else (USESYSTEMLIBS) if(WINDOWS) # Windows has differently named release and debug openjpeg(d) libs. set(OPENJPEG_LIBRARIES - debug openjp2d - optimized openjp2) + debug openjpegd + optimized openjpeg) else(WINDOWS) set(OPENJPEG_LIBRARIES openjpeg) endif(WINDOWS) diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp index 3fe5d56d4f..925da5674b 100644 --- a/indra/llimagej2coj/llimagej2coj.cpp +++ b/indra/llimagej2coj/llimagej2coj.cpp @@ -28,7 +28,7 @@ #include "llimagej2coj.h" // this is defined so that we get static linking. -#include "opj_includes.h" +#include "openjpeg.h" #include "lltimer.h" //#include "llmemory.h" |