Mac OS X Compat

[Jan Wassenberg]

• EntityStateProcessing.cpp:63 ../../../source/simulation/EntityStateProcessing.cpp:63: error: conversion from 'const char*' to 'CStrW' is ambiguous ../../../source/ps/CStr.h:121: note: candidates are: CStrW::CStrW(long unsigned int) <near match> ../../../source/ps/CStr.h:120: note: CStrW::CStrW(long int) <near match> ../../../source/ps/CStr.h:119: note: CStrW::CStrW(unsigned int) <near match> ../../../source/ps/CStr.h:118: note: CStrW::CStrW(int) <near match> ../../../source/ps/CStr.h:89: note: CStrW::CStrW(wchar_t) <near match>

• const char* anim_name = should_run? "run" : "walk"; const CStrW u_anim_name = anim_name;

• !JSConversions.cpp ../../../source/scripting/JSConversions.cpp: In function 'bool ToPrimitive(JSContext*, jsval, T&) [with T = double]' ../../../source/scripting/JSConversions.cpp:154: error: 'finite' was not declared in this scope

• #include "lib/sysdep/sysdep.h" finite../../../source/scripting/JSConversions.cpp: In function 'bool ToPrimitive(JSContext*, jsval, T&) [with T = double]':../../../source/scripting/JSConversions.cpp:154: error: 'finite' was not declared in this scope

• no Byte Order Mark plz

• LightEnv.cpp../../../source/graphics/LightEnv.cpp:1: error: stray '\239' in program (was due to "Hähnle" - have replaced with ae)

• TextureEntry.cpp ../../../source/graphics/TextureEntry.cpp: In member function 'void CTextureEntry::BuildBaseColor()': ../../../source/graphics/TextureEntry.cpp:107: error: invalid conversion from 'int*' to 'GLint*' ../../../source/graphics/TextureEntry.cpp:107: error: initializing argument 4 of 'void glGetTexLevelParameteriv(GLenum, GLint, GLenum, GLint*)' ../../../source/graphics/TextureEntry.cpp:108: error: invalid conversion from 'int*' to 'GLint*' ../../../source/graphics/TextureEntry.cpp:108: error: initializing argument 4 of 'void glGetTexLevelParameteriv(GLenum, GLint, GLenum, GLint*)'

int width,height; --> convert to GLint width,height; glGetTexLevelParameteriv(GL_TEXTURE_2D,0,GL_TEXTURE_WIDTH,&width); glGetTexLevelParameteriv(GL_TEXTURE_2D,0,GL_TEXTURE_HEIGHT,&height);

• No idea wtf is going on with this file (gcc specific??) - Never compiled Color_asm.asm Color_asm.asm ../../../source/graphics/Color_asm.asm:1: fatal: unable to open include file `../lib/sysdep/ia32.inc' make[1]: * [obj/graphics_Debug/Color_asm.o] Error 1 ia32.inc does exist not sure why the compiler is crapping out

• Renderer.cpp ../../../source/renderer/Renderer.cpp:86: error: conflicting return type specified for 'virtual PS_uint CRendererStatsTable::GetNumberRows()' ../../../source/ps/ProfileViewer.h:73: error: overriding 'virtual size_t AbstractProfileTable::GetNumberRows()' --> decide on either size_t or uint (This is all over the code)

• ../../../source/renderer/Renderer.cpp: At global scope: ../../../source/renderer/Renderer.cpp:208: error: cannot declare field 'CRendererInternals::profileTable' to be of abstract type 'CRendererStatsTable' ../../../source/renderer/Renderer.cpp:79: note: because the following virtual functions are pure within 'CRendererStatsTable': ../../../source/ps/ProfileViewer.h:90: note: virtual CStr8 AbstractProfileTable::GetCellText(size_t, size_t) --> change CRendererStatsTable to ... CStr GetCellText(size_t row, size_t col); or uint ../../../source/ps/ProfileViewer.h:100: note: virtual AbstractProfileTable* AbstractProfileTable::GetChild(size_t) --> change CRendererStatsTable to ... AbstractProfileTable* GetChild(size_t row); or unit

• MessagePasserImpl.cpp -- Haven't looked at this at all ../../../source/tools/atlas/GameInterface/MessagePasserImpl.cpp: In member function 'virtual void MessagePasserImpl::Query(AtlasMessage::QueryMessage*, void (*)())': ../../../source/tools/atlas/GameInterface/MessagePasserImpl.cpp:90: error: 'CLOCK_REALTIME' was not declared in this scope ../../../source/tools/atlas/GameInterface/MessagePasserImpl.cpp:90: error: 'clock_gettime' was not declared in this scope ../../../source/tools/atlas/GameInterface/MessagePasserImpl.cpp:92: error: 'sem_timedwait' was not declared in this scope

• !GUIRenderer.cpp -- change int to GLint ../../../source/gui/GUIRenderer.cpp: In member function 'virtual void Effect_MultiplyColor::Set(Handle)': ../../../source/gui/GUIRenderer.cpp:199: error: invalid conversion from 'const int*' to 'const GLint*' ../../../source/gui/GUIRenderer.cpp:199: error: initializing argument 3 of 'void glTexEnviv(GLenum, GLenum, const GLint*)' ../../../source/gui/GUIRenderer.cpp:201: error: invalid conversion from 'const int*' to 'const GLint*' ../../../source/gui/GUIRenderer.cpp:201: error: initializing argument 3 of 'void glTexEnviv(GLenum, GLenum, const GLint*)' ../../../source/gui/GUIRenderer.cpp: In member function 'virtual void Effect_MultiplyColor::Unset()': ../../../source/gui/GUIRenderer.cpp:209: error: invalid conversion from 'const int*' to 'const GLint*' ../../../source/gui/GUIRenderer.cpp:209: error: initializing argument 3 of 'void glTexEnviv(GLenum, GLenum, const GLint*)'

• allocators.cpp --- probably another header issue -same as the first issue mentioned ../../../source/lib/allocators.cpp:65: error: 'MAP_ANONYMOUS' was not declared in this scope

• ogl.cpp - int to GLint plz ... change in header also ../../../source/lib/ogl.cpp: In function 'void oglInit()': ../../../source/lib/ogl.cpp:379: error: invalid conversion from 'int*' to 'GLint*' ../../../source/lib/ogl.cpp:379: error: initializing argument 2 of 'void glGetIntegerv(GLenum, GLint*)' ../../../source/lib/ogl.cpp:380: error: invalid conversion from 'int*' to 'GLint*' ../../../source/lib/ogl.cpp:380: error: initializing argument 2 of 'void glGetIntegerv(GLenum, GLint*)'

• ShadowMap.cpp -- pass in GLint not int ../../../source/renderer/ShadowMap.cpp: In member function 'void ShadowMapInternals::CreateTexture()': ../../../source/renderer/ShadowMap.cpp:279: error: no matching function for call to 'min(int, GLint&)' ../../../source/renderer/ShadowMap.cpp:281: error: no matching function for call to 'min(int, GLint&)'

• string_s.cpp -- header again -- posix.h ../../../source/lib/string_s.cpp: In function 'int strcpy_s(char*, size_t, const char*)': ../../../source/lib/string_s.cpp:160: error: 'SIZE_MAX' was not declared in this scope ../../../source/lib/string_s.cpp: In function 'int strcat_s(char*, size_t, const char*)': ../../../source/lib/string_s.cpp:204: error: 'SIZE_MAX' was not declared in this scope

• timer.cpp -- Will do so later... ../../../source/lib/timer.cpp:65:2: error: #error "get_time: add timer implementation for this platform!" ../../../source/lib/timer.cpp: In function 'TimerClient* timer_add_client(TimerClient*, const char*)': ../../../source/lib/timer.cpp:272: warning: converting to 'TimerUnit' from 'double'

• No idea../../../source/lib/sysdep/ia32.cpp:200: error: PIC register 'ebx' clobbered in 'asm'

• Once again no idea ia32_asm.asm ../../../source/lib/sysdep/ia32_asm.asm:20: fatal: unable to open include file `ia32.inc'

• Again ia32_memcpy.asm ../../../source/lib/sysdep/ia32_memcpy.asm:19: fatal: unable to open include file `ia32.inc'

• Cast size_t to uint ../../../source/lib/res/file/file_stats.cpp:310: error: no matching function for call to 'percent(size_t, PS_uint&)'

• Stat again ../../../source/lib/res/file/archive.cpp:199: error: aggregate 'stat s' has incomplete type and cannot be defined ../../../source/lib/res/file/archive.cpp: In function 'LibError afile_stat(Handle, const char*, stat*)': ../../../source/lib/res/file/archive.cpp:284: error: invalid application of 'sizeof' to incomplete type 'stat' ../../../source/lib/res/file/archive.cpp:291: error: invalid use of undefined type 'struct stat' ../../../source/lib/res/file/file.h:175: error: forward declaration of 'struct stat' ../../../source/lib/res/file/archive.cpp:292: error: invalid use of undefined type 'struct stat' ../../../source/lib/res/file/file.h:175: error: forward declaration of 'struct stat' ../../../source/lib/res/file/archive_builder.cpp:114: error: aggregate 'stat s' has incomplete type and cannot be defined

• tons stat errors in file.cpp, file_util.cpp, trace.cpp,vfs.cpp plus many more

• ../../../source/lib/res/file/trace.cpp:349: error: 'S_ISREG' was not declared in this scope stat structure missing on mac?

• JSInterface_VFS.cpp --lines 125, 145

• Xeromyces.cpp -- lines 214

[Simon Brenner]

I'll close this issue, as I think none of the listed problems are still there. At the very least, sufficient changes have been made to the code for this list not to be useful anymore.

[(none)]

Milestone Playability Demo deleted