OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 10:52:46 +00:00
Code Releases Activity

Move plJPEG into plGImage.

Browse Source 
This matches what was done for plPNG.
This commit is contained in:
Darryl Pogue
2013-01-05 20:34:01 -08:00
parent b574a583f4
commit c77cb10c20
17 changed files with 43 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt
View File

@ -3,6 +3,9 @@ include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib")
include_directories("../../PubUtilLib")
find_package(JPEG REQUIRED)
include_directories(${JPEG_INCLUDE_DIR})
find_package(PNG REQUIRED)
include_directories(${PNG_INCLUDE_DIR})
@ -18,6 +21,7 @@ set(plGImage_SOURCES
plDynSurfaceWriter.cpp
plFont.cpp
plFontCache.cpp
plJPEG.cpp
plLODMipmap.cpp
plMipmap.cpp
plPNG.cpp
@ -38,6 +42,7 @@ set(plGImage_HEADERS
plFont.h
plFontCache.h
plGImageCreatable.h
plJPEG.h
plLODMipmap.h
plMipmap.h
plPNG.h
@ -48,4 +53,4 @@ set(plGImage_HEADERS
add_library(plGImage STATIC ${plGImage_SOURCES} ${plGImage_HEADERS})
source_group("Source Files" FILES ${plGImage_SOURCES})
source_group("Header Files" FILES ${plGImage_HEADERS})
source_group("Header Files" FILES ${plGImage_HEADERS})

2
Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp
View File

@ -59,7 +59,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsColorRGBA.h"
#include "plPipeline/hsGDeviceRef.h"
#include "plProfile.h"
#include "plJPEG/plJPEG.h"
#include "plJPEG.h"
#include <math.h>
plProfile_CreateMemCounter("Mipmaps", "Memory", MemMipmaps);