archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 01:38:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #138 from bagedevimo/nix-fix

Browse source 
More *nix fixes.
This commit is contained in:
Alexandro Sánchez Bach 2014-03-29 16:26:08 +01:00
commit 7804c56584
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rpcs3/CMakeLists.txt
View file

@ -7,6 +7,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
#add_definitions(-Wfatal-errors) #add_definitions(-Wfatal-errors)
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!!
endif() endif()
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules)

7
rpcs3/Emu/GS/GL/OpenGL.cpp
View file

@ -10,6 +10,10 @@ void InitProcTable()
#undef OPENGL_PROC #undef OPENGL_PROC
#undef OPENGL_PROC2 #undef OPENGL_PROC2
#endif #endif
#ifdef __UNIX__
glewExperimental = true;
glewInit();
#endif
} }
#ifdef _WIN32 #ifdef _WIN32
@ -39,9 +43,6 @@ void OpenGL::Init()
#include "GLProcTable.tbl" #include "GLProcTable.tbl"
#undef OPENGL_PROC #undef OPENGL_PROC
#undef OPENGL_PROC2 #undef OPENGL_PROC2
#elif __UNIX__
glewExperimental = true;
glewInit();
#endif #endif
} }

2
rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp
View file

@ -155,7 +155,7 @@ int cellPngDecDecodeData(u32 mainHandle, u32 subHandle, mem8_ptr_t data, const m
//Decode PNG file. (TODO: Is there any faster alternative? Can we do it without external libraries?) //Decode PNG file. (TODO: Is there any faster alternative? Can we do it without external libraries?)
int width, height, actual_components; int width, height, actual_components;
std::shared_ptr<unsigned char> image(stbi_load_from_memory(png, fileSize, &width, &height, &actual_components, 4)); std::shared_ptr<unsigned char> image(stbi_load_from_memory(png.GetPtr(), fileSize, &width, &height, &actual_components, 4));
if (!image) return CELL_PNGDEC_ERROR_STREAM_FORMAT; if (!image) return CELL_PNGDEC_ERROR_STREAM_FORMAT;
uint image_size = width * height; uint image_size = width * height;