Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OS X Builds now.

Browse Source 
Fixed building on OS X.
Fixed line endings.
Need to find better way to do fmodwrapper thing.
This commit is contained in:
Drake Arconis
2012-02-19 11:30:27 -05:00
parent 23811df3cf
commit 925c42294f
5 changed files with 899 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/fmodwrapper.cpp
View File

@@ -30,12 +30,17 @@
* $/LicenseInfo$ * $/LicenseInfo$
*/ */
//Hack to build Darwin.
//Need to find a better way to do this later.
#define LL_FMOD
extern "C" extern "C"
{ {
#if LL_FMODEX #ifdef LL_FMODEX
void FSOUND_Sound_Init(void); void FSOUND_Sound_Init(void);
#endif #endif
#if LL_FMOD
#ifdef LL_FMOD
void FSOUND_Init(void); void FSOUND_Init(void);
#endif #endif
} }
@@ -44,12 +49,11 @@ void* fmodwrapper(void)
{ {
// When building the fmodwrapper library, the linker doesn't seem to want to bring in libfmod.a unless I explicitly // When building the fmodwrapper library, the linker doesn't seem to want to bring in libfmod.a unless I explicitly
// reference at least one symbol in the library. This seemed like the simplest way. // reference at least one symbol in the library. This seemed like the simplest way.
void *ret = NULL; #ifdef LL_FMODEX
#if LL_FMODEX return (void*)&FSOUND_Sound_Init;
ret = (void*)&FSOUND_Sound_Init;
#endif #endif
#if LL_FMOD
ret = (void*)&FSOUND_Init; #ifdef LL_FMOD
return (void*)&FSOUND_Init;
#endif #endif
return ret;
} }

2
indra/newview/llstartup.cpp
View File

@@ -3492,7 +3492,7 @@ bool update_dialog_callback(const LLSD& notification, const LLSD& response)
LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" -name \""; LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" -name \"";
LLAppViewer::sUpdaterInfo->mUpdateExePath += LLAppViewer::instance()->getSecondLifeTitle(); LLAppViewer::sUpdaterInfo->mUpdateExePath += LLAppViewer::instance()->getSecondLifeTitle();
LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" -bundleid \""; LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" -bundleid \"";
LLAppViewer::sUpdaterInfo->mUpdateExePath += LL_VERSION_BUNDLE_ID; LLAppViewer::sUpdaterInfo->mUpdateExePath += gVersionBundleID;
LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" &"; LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" &";
LL_DEBUGS("AppInit") << "Calling updater: " << LLAppViewer::sUpdaterInfo->mUpdateExePath << LL_ENDL; LL_DEBUGS("AppInit") << "Calling updater: " << LLAppViewer::sUpdaterInfo->mUpdateExePath << LL_ENDL;

3
indra/newview/sgversion.cpp
View File

@@ -28,3 +28,6 @@ const S32 gVersionBuild = LL_VERSION_BUILD;
const char* gVersionChannel = LL_CHANNEL; const char* gVersionChannel = LL_CHANNEL;
#if LL_DARWIN
const char* gVersionBundleID = LL_VERSION_BUNDLE_ID;
#endif

3
indra/newview/sgversion.h
View File

@@ -25,5 +25,8 @@ extern const S32 gVersionBuild;
extern const char* gVersionChannel; extern const char* gVersionChannel;
#if LL_DARWIN
extern const char* gVersionBundleID;
#endif
#endif #endif