FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaneup \machine setting for MSVC, now only for 64bit static libs, only

Browse Source 
onwe for which needed. Added a comment showing why its needed


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1119 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2012-03-12 07:26:37 +00:00
parent b2159329f2
commit b16eb164ca
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
freeglut/freeglut/CMakeLists.txt
View File

@ -216,22 +216,14 @@ IF(WIN32)
LIST(APPEND LIBS winmm) LIST(APPEND LIBS winmm)
IF(BUILD_SHARED_LIBS) IF(BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS) SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS)
IF (CMAKE_CL_64)
# 64bit build
SET_TARGET_PROPERTIES(freeglut PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
ELSE()
# 32bit build
SET_TARGET_PROPERTIES(freeglut PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x86")
ENDIF()
ENDIF() ENDIF()
IF(BUILD_STATIC_LIBS) IF(BUILD_STATIC_LIBS)
SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC)
# need to set machine:x64 for linker, at least for VC10, and
# doesn't hurt for older compilers:
# http://public.kitware.com/Bug/view.php?id=11240#c22768
IF (CMAKE_CL_64) IF (CMAKE_CL_64)
# 64bit build
SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
ELSE()
# 32bit build
SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x86")
ENDIF() ENDIF()
ENDIF() ENDIF()
ELSE() ELSE()