1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Win64 fix: if you disable enough things in CMakeList.txt blender compiles on win64 now using cmake --> *BUT* it doesn't say anything about if it works with MEM>4GB (that's next thing to explore!)

Browse Source
This commit is contained in:
Daniel Genrich 2008-07-13 18:29:07 +00:00
parent 37ca3d7a39
commit 8a19adeb58
4 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CMakeLists.txt
View File

@ -197,10 +197,17 @@ IF(UNIX)
ENDIF(UNIX) ENDIF(UNIX)
IF(WIN32) IF(WIN32)
INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake) INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows) SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
# Setup 64bit and 64bit windows systems
IF(CMAKE_CL_64)
message("64 bit compiler detected.")
SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
ENDIF(CMAKE_CL_64)
SET(PYTHON ${LIBDIR}/python) SET(PYTHON ${LIBDIR}/python)
SET(PYTHON_VERSION 2.5) SET(PYTHON_VERSION 2.5)
SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}") SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
@ -214,12 +221,20 @@ IF(WIN32)
SET(OPENAL_LIB openal_static) SET(OPENAL_LIB openal_static)
SET(OPENAL_LIBPATH ${OPENAL}/lib) SET(OPENAL_LIBPATH ${OPENAL}/lib)
SET(PNG_LIB libpng_st) IF(CMAKE_CL_64)
SET(PNG_LIB libpng)
ELSE(CMAKE_CL_64)
SET(PNG_LIB libpng_st)
ENDIF(CMAKE_CL_64)
SET(JPEG_LIB libjpeg) SET(JPEG_LIB libjpeg)
SET(ZLIB ${LIBDIR}/zlib) SET(ZLIB ${LIBDIR}/zlib)
SET(ZLIB_INC ${ZLIB}/include) SET(ZLIB_INC ${ZLIB}/include)
SET(ZLIB_LIB libz) IF(CMAKE_CL_64)
SET(ZLIB_LIB zlib)
ELSE(CMAKE_CL_64)
SET(ZLIB_LIB libz)
ENDIF(CMAKE_CL_64)
SET(ZLIB_LIBPATH ${ZLIB}/lib) SET(ZLIB_LIBPATH ${ZLIB}/lib)
SET(PTHREADS ${LIBDIR}/pthreads) SET(PTHREADS ${LIBDIR}/pthreads)
@ -302,7 +317,11 @@ IF(WIN32)
SET(WINTAB_INC ${LIBDIR}/wintab/include) SET(WINTAB_INC ${LIBDIR}/wintab/include)
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib") IF(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib;MSVCRT.lib ")
ELSE(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
ENDIF(CMAKE_CL_64)
SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ") SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
ENDIF(WIN32) ENDIF(WIN32)

2
intern/bsp/intern/BSP_CSGMesh.cpp
View File

@ -197,7 +197,7 @@ BuildEdges(
for (int vert = 0; vert < vertex_num; ++vert) { for (int vert = 0; vert < vertex_num; ++vert) {
BSP_FaceInd fi(f_it - f_it_begin); BSP_FaceInd fi(size_t (f_it - f_it_begin));
InsertEdge(prev_vi,face.m_verts[vert],fi,dummy); InsertEdge(prev_vi,face.m_verts[vert],fi,dummy);
prev_vi = face.m_verts[vert]; prev_vi = face.m_verts[vert];
} }

16
intern/container/CTR_TaggedIndex.h
View File

@ -93,6 +93,16 @@ public:
} }
#if defined(_WIN64)
CTR_TaggedIndex(
const unsigned __int64 val
) :
m_val ( ((unsigned __int64)val & index_mask)
| ( (empty_tag << tag_shift)
& (~index_mask) ) ) {
}
#endif
CTR_TaggedIndex( CTR_TaggedIndex(
const CTR_TaggedIndex &my_index const CTR_TaggedIndex &my_index
): ):
@ -124,6 +134,12 @@ public:
return (long int)(m_val & index_mask); return (long int)(m_val & index_mask);
} }
#if defined(_WIN64)
operator unsigned __int64 () const {
return (unsigned __int64)(m_val & index_mask);
}
#endif
bool bool
IsEmpty( IsEmpty(
) const { ) const {

6
intern/decimation/intern/LOD_ManMesh2.cpp
View File

@ -477,7 +477,7 @@ DeleteVertex(
return; return;
} }
LOD_VertexInd last = LOD_VertexInd(verts.end() - verts.begin() - 1); LOD_VertexInd last = LOD_VertexInd(size_t(verts.end() - verts.begin() - 1));
if (!(last == v)) { if (!(last == v)) {
@ -533,7 +533,7 @@ DeleteEdge(
return; return;
} }
LOD_EdgeInd last = LOD_EdgeInd(edges.end() - edges.begin() - 1); LOD_EdgeInd last = LOD_EdgeInd(size_t(edges.end() - edges.begin() - 1));
if (!(last == e)) { if (!(last == e)) {
vector<LOD_EdgeInd> e_verts; vector<LOD_EdgeInd> e_verts;
@ -573,7 +573,7 @@ DeleteFace(
return; return;
} }
LOD_FaceInd last = LOD_FaceInd(faces.end() - faces.begin() - 1); LOD_FaceInd last = LOD_FaceInd(size_t (faces.end() - faces.begin() - 1));
if (!(last == f)) { if (!(last == f)) {