mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 02:56:38 +00:00
Code Issues Releases Wiki Activity

Merge remote branch 'ace/win64-fixes'

Browse source
This commit is contained in:
Marc Zinnschlag 2012-03-02 11:00:41 +01:00
commit a86d2877fc
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CMakeLists.txt
View file

@ -347,11 +347,17 @@ if(WIN32)
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.openmw.org") SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.openmw.org")
SET(CPACK_NSIS_INSTALLED_ICON_NAME "omwlauncher.exe") SET(CPACK_NSIS_INSTALLED_ICON_NAME "omwlauncher.exe")
SET(VCREDIST "${OpenMW_BINARY_DIR}/vcredist_x86.exe") SET(VCREDIST32 "${OpenMW_BINARY_DIR}/vcredist_x86.exe")
if(EXISTS ${VCREDIST}) if(EXISTS ${VCREDIST32})
INSTALL(FILES ${VCREDIST} DESTINATION "redist") INSTALL(FILES ${VCREDIST32} DESTINATION "redist")
SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\redist\\\\vcredist_x86.exe\\\" /q'" ) SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\redist\\\\vcredist_x86.exe\\\" /q'" )
endif(EXISTS ${VCREDIST}) endif(EXISTS ${VCREDIST32})
SET(VCREDIST64 "${OpenMW_BINARY_DIR}/vcredist_x64.exe")
if(EXISTS ${VCREDIST64})
INSTALL(FILES ${VCREDIST64} DESTINATION "redist")
SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\redist\\\\vcredist_x64.exe\\\" /q'" )
endif(EXISTS ${VCREDIST64})
SET(OALREDIST "${OpenMW_BINARY_DIR}/oalinst.exe") SET(OALREDIST "${OpenMW_BINARY_DIR}/oalinst.exe")
if(EXISTS ${OALREDIST}) if(EXISTS ${OALREDIST})
@ -360,6 +366,10 @@ if(WIN32)
ExecWait '\\\"$INSTDIR\\\\redist\\\\oalinst.exe\\\" /s'" ) ExecWait '\\\"$INSTDIR\\\\redist\\\\oalinst.exe\\\" /s'" )
endif(EXISTS ${OALREDIST}) endif(EXISTS ${OALREDIST})
if(CMAKE_CL_64)
SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
endif()
include(CPack) include(CPack)
endif(WIN32) endif(WIN32)

2
components/files/windowspath.cpp
View file

@ -75,7 +75,7 @@ boost::filesystem::path WindowsPath::getInstallPath() const
BOOL f64 = FALSE; BOOL f64 = FALSE;
LPCTSTR regkey; LPCTSTR regkey;
if (IsWow64Process(GetCurrentProcess(), &f64) && f64) if ((IsWow64Process(GetCurrentProcess(), &f64) && f64) || sizeof(void*) == 8)
{ {
regkey = "SOFTWARE\\Wow6432Node\\Bethesda Softworks\\Morrowind"; regkey = "SOFTWARE\\Wow6432Node\\Bethesda Softworks\\Morrowind";
} }