mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-13 11:39:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #146 from darkf/stuff

Browse source 
Add FindGLEW to CMake build and fix naming error
This commit is contained in:
Alexandro Sánchez Bach 2014-03-31 11:23:17 +02:00
commit 8011cc8ec4
5 changed files with 56 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rpcs3/CMakeLists.txt
View file

@ -8,6 +8,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-w) # TODO: remove me add_definitions(-w) # TODO: remove me
add_definitions(-fpermissive) # TODO: remove me add_definitions(-fpermissive) # TODO: remove me
add_definitions(-g) # Debugging!! add_definitions(-g) # Debugging!!
add_definitions(-msse2)
endif() endif()
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules)
@ -59,5 +60,5 @@ ${CMAKE_SOURCE_DIR}/../Utilities/*
add_executable(rpcs3 ${RPCS3_SRC}) add_executable(rpcs3 ${RPCS3_SRC})
target_link_libraries(rpcs3 ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a ${ZLIB_LIBRARIES}) target_link_libraries(rpcs3 ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES} libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a ${ZLIB_LIBRARIES})

4
rpcs3/Crypto/unedat.cpp
View file

@ -457,7 +457,7 @@ void validate_data(const char* file_name, unsigned char *klicensee, NPD_HEADER *
else else
{ {
// Generate klicensee xor key. // Generate klicensee xor key.
xor(key, klicensee, NP_OMAC_KEY_2, 0x10); xor_(key, klicensee, NP_OMAC_KEY_2, 0x10);
// Hash with generated key and compare with dev_hash. // Hash with generated key and compare with dev_hash.
dev_hash_result = cmac_hash_compare(key, 0x10, (unsigned char *)npd, 0x60, npd->dev_hash); dev_hash_result = cmac_hash_compare(key, 0x10, (unsigned char *)npd, 0x60, npd->dev_hash);
@ -529,7 +529,7 @@ bool extract_data(wxFile *input, wxFile *output, const char* input_file_name, un
if((EDAT->flags & SDAT_FLAG) == SDAT_FLAG) if((EDAT->flags & SDAT_FLAG) == SDAT_FLAG)
{ {
ConLog.Warning("EDAT: SDAT detected!\n"); ConLog.Warning("EDAT: SDAT detected!\n");
xor(key, NPD->dev_hash, SDAT_KEY, 0x10); xor_(key, NPD->dev_hash, SDAT_KEY, 0x10);
} }
else else
{ {

2
rpcs3/Crypto/utils.cpp
View file

@ -20,7 +20,7 @@ u64 swap64(u64 i)
((i & 0x00ff000000000000) >> 40) | ((i & 0xff00000000000000) >> 56); ((i & 0x00ff000000000000) >> 40) | ((i & 0xff00000000000000) >> 56);
} }
void xor(unsigned char *dest, unsigned char *src1, unsigned char *src2, int size) void xor_(unsigned char *dest, unsigned char *src1, unsigned char *src2, int size)
{ {
int i; int i;
for(i = 0; i < size; i++) for(i = 0; i < size; i++)

2
rpcs3/Crypto/utils.h
View file

@ -6,7 +6,7 @@
u16 swap16(u16 i); u16 swap16(u16 i);
u32 swap32(u32 i); u32 swap32(u32 i);
u64 swap64(u64 i); u64 swap64(u64 i);
void xor(unsigned char *dest, unsigned char *src1, unsigned char *src2, int size); void xor_(unsigned char *dest, unsigned char *src1, unsigned char *src2, int size);
// Hex string conversion auxiliary functions. // Hex string conversion auxiliary functions.
u64 hex_to_u64(const char* hex_str); u64 hex_to_u64(const char* hex_str);

47
rpcs3/cmake_modules/FindGLEW.cmake Normal file
View file

@ -0,0 +1,47 @@
#
# Try to find GLEW library and include path.
# Once done this will define
#
# GLEW_FOUND
# GLEW_INCLUDE_PATH
# GLEW_LIBRARY
#
IF (WIN32)
FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
$ENV{PROGRAMFILES}/GLEW/include
${PROJECT_SOURCE_DIR}/src/nvgl/glew/include
DOC "The directory where GL/glew.h resides")
FIND_LIBRARY( GLEW_LIBRARY
NAMES glew GLEW glew32 glew32s
PATHS
$ENV{PROGRAMFILES}/GLEW/lib
${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
DOC "The GLEW library")
ELSE (WIN32)
FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
/usr/include
/usr/local/include
/sw/include
/opt/local/include
DOC "The directory where GL/glew.h resides")
FIND_LIBRARY( GLEW_LIBRARY
NAMES GLEW glew
PATHS
/usr/lib64
/usr/lib
/usr/local/lib64
/usr/local/lib
/sw/lib
/opt/local/lib
DOC "The GLEW library")
ENDIF (WIN32)
IF (GLEW_INCLUDE_PATH)
SET( GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
ELSE (GLEW_INCLUDE_PATH)
SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
ENDIF (GLEW_INCLUDE_PATH)
MARK_AS_ADVANCED( GLEW_FOUND )