Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-12 17:48:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CityHash is not used anymore, so we won't compile it.

Browse Source
This commit is contained in:
Sacha 2013-10-28 03:26:00 +10:00
parent 9fcb08a326
commit ecfe43c149
7 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -334,13 +334,6 @@ add_library(rg_etc1 STATIC
native/ext/rg_etc1/rg_etc1.h)
include_directories(native/ext/rg_etc1)
add_library(cityhash STATIC
native/ext/cityhash/city.cpp
native/ext/cityhash/city.h
native/ext/cityhash/citycrc.h
)
include_directories(ext/cityhash)
if(NOT USING_GLES2)
include_directories(${OPENGL_INCLUDE_DIR})
@ -961,7 +954,7 @@ add_library(${CoreLibName} ${CoreLinkType}
$<TARGET_OBJECTS:GPU>
Globals.h
git-version.cpp)
target_link_libraries(${CoreLibName} Common native kirk cityhash xbrz xxhash
target_link_libraries(${CoreLibName} Common native kirk xbrz xxhash
${CoreExtraLibs} ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES})
setup_target_project(${CoreLibName} Core)
@ -1296,7 +1289,6 @@ if(APPLE)
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -D_NDEBUG")
# These can be fast even for debug.
set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
set_target_properties(snappy PROPERTIES COMPILE_FLAGS "-O3")
set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
endif()

14
Core/HLE/sceJpeg.cpp
View File

@ -18,9 +18,14 @@
#include "Core/HLE/HLE.h"
#include "Core/Reporting.h"
#include "Common.h"
#include "native/ext/cityhash/city.h"
#include "native/ext/jpge/jpgd.h"
//Uncomment if you want to dump JPEGs loaded through sceJpeg to a file
//#define JPEG_DEBUG
#ifdef JPEG_DEBUG
#include "ext/xxhash.h"
#endif
#include <algorithm>
static int mjpegWidth, mjpegHeight;
@ -55,9 +60,6 @@ u32 convertYCbCrToABGR (int y, int cb, int cr) {
return 0xFF000000 | (b << 16) | (g << 8) | (r << 0);
}
//Uncomment if you want to dump JPEGs loaded through sceJpeg to a file
//#define JPEG_DEBUG
int sceJpegDecompressAllImage()
{
ERROR_LOG_REPORT(ME, "UNIMPL sceJpegDecompressAllImage()");
@ -193,8 +195,8 @@ int sceJpegGetOutputInfo(u32 jpegAddr, int jpegSize, u32 colourInfoAddr, int dht
#ifdef JPEG_DEBUG
char jpeg_fname[256];
u8 *jpegBuf = Memory::GetPointer(jpegAddr);
uint32 jpeg_cityhash = CityHash32((const char *)jpegBuf, jpegSize);
sprintf(jpeg_fname, "Jpeg\\%X.jpg", jpeg_cityhash);
uint32 jpeg_xxhash = XXH32((const char *)jpegBuf, jpegSize, 0xC0108888);
sprintf(jpeg_fname, "Jpeg\\%X.jpg", jpeg_xxhash);
FILE *wfp = fopen(jpeg_fname, "wb");
if (!wfp) {
_wmkdir(L"Jpeg\\");

1
GPU/Directx9/TextureCacheDX9.cpp
View File

@ -29,7 +29,6 @@
#include "ext/xxhash.h"
#include "math/math_util.h"
#include "native/ext/cityhash/city.h"
extern int g_iNumVideos;

1
GPU/Directx9/TransformPipelineDX9.cpp
View File

@ -26,7 +26,6 @@
#include "Core/CoreTiming.h"
#include "helper/dx_state.h"
#include "native/ext/cityhash/city.h"
#include "ext/xxhash.h"
#include "GPU/Math3D.h"

1
GPU/GLES/TextureCache.cpp
View File

@ -29,7 +29,6 @@
#include "ext/xxhash.h"
#include "math/math_util.h"
#include "native/ext/cityhash/city.h"
#include "native/gfx_es2/gl_state.h"
#ifdef _M_SSE

1
GPU/GLES/TransformPipeline.cpp
View File

@ -75,7 +75,6 @@
#include "Core/CoreTiming.h"
#include "native/gfx_es2/gl_state.h"
#include "native/ext/cityhash/city.h"
#include "ext/xxhash.h"
#include "GPU/Math3D.h"

6
Qt/Native.pro
View File

@ -23,12 +23,6 @@ SOURCES += ../native/ext/rg_etc1/rg_etc1.cpp
HEADERS += ../native/ext/rg_etc1/rg_etc1.h
INCLUDEPATH += ../native/ext/rg_etc1
# Cityhash
SOURCES += ../native/ext/cityhash/city.cpp
HEADERS += ../native/ext/cityhash/*.h
INCLUDEPATH += ../native/ext/cityhash
# JPGE
SOURCES += ../native/ext/jpge/*.cpp
HEADERS += ../native/ext/jpge/*.h