marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvc: Working build on x64 

Win64 is a LLP64 architecture, so please don't use a long for storing
pointers. Use intptr_t instead.
Nicolas Hake 2010-02-28 01:42:57 +01:00
parent f617bb3a8f
commit 766abfd190
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -23,7 +23,7 @@ if(WIN32)
option(USE_DIRECTX "Enable DirectX support" ON)
if(EXISTS $ENV{DXSDK_DIR})
include_directories(SYSTEM $ENV{DXSDK_DIR}/Include)
if(${FIND_LIBRARY_USE_LIB64_PATHS})
if(CMAKE_CL_64)
list(APPEND CMAKE_LIBRARY_PATH $ENV{DXSDK_DIR}/Lib/x64)
else()
list(APPEND CMAKE_LIBRARY_PATH $ENV{DXSDK_DIR}/Lib/x86)
@ -73,7 +73,7 @@ endif()
if(MSVC_VERSION GREATER 1499)
# Activate minimal rebuild
list(APPEND OC_CXX_FLAGS_DEBUG /Gm)
if (NOT FIND_LIBRARY_USE_LIB64_PATHS)
if (NOT CMAKE_CL_64)
# Activate edit-and-continue
list(REMOVE_ITEM OC_CXX_FLAGS_DEBUG /Zi)
list(APPEND OC_CXX_FLAGS_DEBUG /ZI /Gy)

2
src/script/C4Value.h
View File

@ -51,7 +51,7 @@ char GetC4VID(const C4V_Type Type);
C4V_Type GetC4VFromID(char C4VID);
union C4V_Data {
long Int;
intptr_t Int;
C4Object * Obj;
C4PropList * PropList;
C4String * Str;