From f96a4f3ddfdd9cb5918433277913d042b6137cb3 Mon Sep 17 00:00:00 2001 From: Andrew McMahon Date: Wed, 26 Feb 2014 23:05:11 +0000 Subject: [PATCH] Upgraded to support VC 12 --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d18ed8f..d300917 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,11 +14,11 @@ INCLUDE_DIRECTORIES( ${INCLUDE_DIR} ) SET( LIBGLEW_SRCS ${SRC_DIR}/glew.c ) IF( WIN32 ) - ADD_DEFINITIONS( -DWIN32_MEAN_AND_LEAN -DVC_EXTRALEAN -DGLEW_BUILD ) + ADD_DEFINITIONS( -DWIN32_MEAN_AND_LEAN -DVC_EXTRALEAN -DGLEW_BUILD -D_CRT_SECURE_NO_WARNINGS ) ENDIF( ) # MSVC11 -IF( MSVC AND NOT MSVC11 ) +IF( MSVC AND NOT (MSVC11 OR MSVC12)) LIST( APPEND LIBGLEW_SRCS ${RC_DIR}/glew.rc ) ENDIF( ) @@ -38,11 +38,13 @@ ELSE( ) ENDIF( ) SET_PROPERTY( TARGET libglew_static PROPERTY ARCHIVE_OUTPUT_NAME "glew" ) +SET_PROPERTY( TARGET libglew_static PROPERTY DEBUG_POSTFIX d ) IF( WIN32 ) SET_PROPERTY( TARGET libglew_shared PROPERTY RUNTIME_OUTPUT_NAME "glew" ) ELSE( ) SET_PROPERTY( TARGET libglew_shared PROPERTY LIBRARY_OUTPUT_NAME "glew" ) ENDIF( ) +SET_PROPERTY( TARGET libglew_shared PROPERTY DEBUG_POSTFIX d ) TARGET_LINK_LIBRARIES( libglew_shared ${GL_LIBRARY} )