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

Get windows 64-bit building

Browse Source
This commit is contained in:
Drake Arconis
2016-01-16 18:50:38 -05:00
parent 47bdf3ecea
commit 58e08a972d
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/00-Common.cmake
View File

@@ -77,6 +77,8 @@ if (WINDOWS)
/nologo /nologo
/Oy- /Oy-
/Zm140 /Zm140
/wd4267
/wd4244
) )
if (WORD_SIZE EQUAL 32) if (WORD_SIZE EQUAL 32)

4
indra/llmessage/aicurl.cpp
View File

@@ -195,10 +195,10 @@ ssl_dyn_create_function_type old_ssl_dyn_create_function;
ssl_dyn_destroy_function_type old_ssl_dyn_destroy_function; ssl_dyn_destroy_function_type old_ssl_dyn_destroy_function;
ssl_dyn_lock_function_type old_ssl_dyn_lock_function; ssl_dyn_lock_function_type old_ssl_dyn_lock_function;
#if LL_WINDOWS #if LL_WINDOWS && !HAVE_CRYPTO_THREADID
static unsigned long __cdecl apr_os_thread_current_wrapper() static unsigned long __cdecl apr_os_thread_current_wrapper()
{ {
return (unsigned long)apr_os_thread_current(); return (unsigned long)(HANDLE)apr_os_thread_current();
} }
#endif #endif

4
indra/llrender/llvertexbuffer.cpp
View File

@@ -1399,13 +1399,13 @@ void LLVertexBuffer::setupVertexArray()
//glVertexattribIPointer requires GLSL 1.30 or later //glVertexattribIPointer requires GLSL 1.30 or later
if (gGLManager.mGLSLVersionMajor > 1 || gGLManager.mGLSLVersionMinor >= 30) if (gGLManager.mGLSLVersionMajor > 1 || gGLManager.mGLSLVersionMinor >= 30)
{ {
glVertexAttribIPointer(i, attrib_size[i], attrib_type[i], sTypeSize[i], reinterpret_cast<void*>(mOffsets[i])); glVertexAttribIPointer(i, attrib_size[i], attrib_type[i], sTypeSize[i], reinterpret_cast<void*>(static_cast<intptr_t>(mOffsets[i])));
} }
#endif #endif
} }
else else
{ {
glVertexAttribPointerARB(i, attrib_size[i], attrib_type[i], attrib_normalized[i], sTypeSize[i], reinterpret_cast<void*>(mOffsets[i])); glVertexAttribPointerARB(i, attrib_size[i], attrib_type[i], attrib_normalized[i], sTypeSize[i], reinterpret_cast<void*>(static_cast<intptr_t>(mOffsets[i])));
} }
} }
else else

2
indra/newview/statemachine/aifilepicker.cpp
View File

@@ -400,7 +400,7 @@ void AIFilePicker::multiplex_impl(state_type run_state)
#if LL_WINDOWS || (LL_GTK && LL_X11) #if LL_WINDOWS || (LL_GTK && LL_X11)
std::ostringstream window_id_str; std::ostringstream window_id_str;
#if LL_WINDOWS #if LL_WINDOWS
unsigned long window_id = (unsigned long)gViewerWindow->getPlatformWindow(); unsigned long window_id = (unsigned long)(intptr_t)gViewerWindow->getPlatformWindow();
#else #else
unsigned long window_id = LLWindowSDL::get_SDL_XWindowID(); unsigned long window_id = LLWindowSDL::get_SDL_XWindowID();
#endif #endif

2
indra/plugins/filepicker/llfilepicker.h
View File

@@ -160,7 +160,7 @@ private:
WCHAR mFilesW[FILENAME_BUFFER_SIZE]; WCHAR mFilesW[FILENAME_BUFFER_SIZE];
public: public:
void setWindowID(unsigned long window_id) { mOFN.hwndOwner = (HWND)window_id; } void setWindowID(unsigned long window_id) { mOFN.hwndOwner = (HWND)(intptr_t)window_id; }
private: private:
bool setupFilter(ELoadFilter filter); bool setupFilter(ELoadFilter filter);