echoes91
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed several problems to the XCode Project file for MAX OSX environment. Make a couple of minor changes to miniz.h and LineMaterial.cpp in order to fix compile-time problems. The project now builds without errors on Mac OSX 10.10 (Yosemite) and XCode 6.

master
Sal Borrelli 2015-11-23 18:02:55 +01:00
parent 9c17527b7c
commit 160db0a127
3 changed files with 2543 additions and 2298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/miniz/miniz.h
View File

@ -2790,7 +2790,7 @@ void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h,
*pLen_out = out_buf.m_size-41;
{
mz_uint8 pnghdr[41]={0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,
0,0,(mz_uint8)(w>>8),(mz_uint8)w,0,0,(mz_uint8)(h>>8),(mz_uint8)h,8,"\0\0\04\02\06"[num_chans],0,0,0,0,0,0,0,
0,0,(mz_uint8)(w>>8),(mz_uint8)w,0,0,(mz_uint8)(h>>8),(mz_uint8)h,8,static_cast<mz_uint8>("\0\0\04\02\06"[num_chans]),0,0,0,0,0,0,0,
(mz_uint8)(*pLen_out>>24),(mz_uint8)(*pLen_out>>16),(mz_uint8)(*pLen_out>>8),(mz_uint8)*pLen_out,0x49,0x44,0x41,0x54};
c=(mz_uint32)mz_crc32(MZ_CRC32_INIT,pnghdr+12,17); for (i=0; i<4; ++i, c<<=8) ((mz_uint8*)(pnghdr+29))[i]=(mz_uint8)(c>>24);
memcpy(out_buf.m_pBuf, pnghdr, 41);

4835
osx/pioneer.xcodeproj/project.pbxproj
View File

File diff suppressed because one or more lines are too long

4
src/graphics/opengl/LineMaterial.cpp
View File

@ -13,7 +13,7 @@ namespace Graphics {
namespace OGL {
// LineProgram -------------------------------------------
LineProgram::LineProgram(const std::string &filename, const std::string &defines) : Program(filename, defines, true)
LineProgram::LineProgram(const std::string &filename, const std::string &defines) : Program(filename, defines)
{
}
@ -26,7 +26,7 @@ void LineProgram::InitUniforms()
// LineMaterial -----------------------------------
Program *LineMaterial::CreateProgram(const MaterialDescriptor &desc)
{
assert(desc.effect == EFFECT_LINE);
//assert(desc.effect == EFFECT_LINE);
return new Graphics::OGL::LineProgram("line", "");
}