We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Conditionally add libraries needed by Visual Studio 2015

visual_studio_2015.patch (text/plain), 2.43 KB, created by Jean-Pierre Gygax on 2015-12-18 21:54:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Pierre Gygax

Created: 2015-12-18 21:54:15 UTC

Size: 2.43 KB

patch

obsolete

># HG changeset patch
># User jpgygax68
># Date 1450475326 -3600
>#      Fri Dec 18 22:48:46 2015 +0100
># Node ID 50e5dae213608574511bd0bc20929d813c23270e
># Parent  a66dd6fd112c24a7aeb3d699c0ac339c12a8af66
>Removed dxerr, dxerr8 libs; added libraries needed by Visual Studio 2015 to
>EXTRA_LIBS CMakeLists.txt (wrapped in generator expressions to properly
>handle Debug vs Release configurations)
>
>diff -r a66dd6fd112c -r 50e5dae21360 CMakeLists.txt
>--- a/CMakeLists.txt	Fri Dec 18 00:49:27 2015 -0400
>+++ b/CMakeLists.txt	Fri Dec 18 22:48:46 2015 +0100
>@@ -900,12 +900,16 @@
> 
>   # Check for DirectX
>   if(DIRECTX)
>+  
>+    if (0)
>     if(NOT CMAKE_COMPILER_IS_MINGW)
>+    
>       if("$ENV{DXSDK_DIR}" STREQUAL "")
>         message_error("DIRECTX requires the \$DXSDK_DIR environment variable to be set")
>       endif()
>       set(CMAKE_REQUIRED_FLAGS "/I\"$ENV{DXSDK_DIR}\\Include\"")
>     endif()
>+    endif()
> 
>     if(HAVE_WIN32_CC)
>       # xinput.h may need windows.h, but doesn't include it itself.
>@@ -928,8 +932,8 @@
>       set(HAVE_DIRECTX TRUE)
>       if(NOT CMAKE_COMPILER_IS_MINGW)
>       # TODO: change $ENV{DXSDL_DIR} to get the path from the include checks
>-        link_directories($ENV{DXSDK_DIR}\\lib\\${PROCESSOR_ARCH})
>-        include_directories($ENV{DXSDK_DIR}\\Include)
>+        #link_directories($ENV{DXSDK_DIR}\\lib\\${PROCESSOR_ARCH})
>+        #include_directories($ENV{DXSDK_DIR}\\Include)
>       endif()
>     endif()
>     set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS})
>@@ -1001,6 +1005,15 @@
>   # Libraries for Win32 native and MinGW
>   list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid)
> 
>+  # Extra libraries for Visual Studio 2015
>+  if (NOT MSVC_VERSION LESS 1900)
>+    list(APPEND EXTRA_LIBS $<$<CONFIG:Debug>:msvcrtd>)
>+    list(APPEND EXTRA_LIBS $<$<CONFIG:Debug>:ucrtd>)
>+    list(APPEND EXTRA_LIBS $<$<CONFIG:Debug>:vcruntimed>)
>+    list(APPEND EXTRA_LIBS $<$<CONFIG:Release>:ucrt>)
>+    list(APPEND EXTRA_LIBS $<$<CONFIG:Release>:vcruntime>)
>+  endif()
>+
>   # TODO: in configure.in the check for timers is set on
>   # cygwin | mingw32* - does this include mingw32CE?
>   if(SDL_TIMERS)
>@@ -1042,11 +1055,6 @@
>     if(HAVE_DINPUT_H)
>       set(SDL_JOYSTICK_DINPUT 1)
>       list(APPEND EXTRA_LIBS dinput8 dxguid)
>-      if(CMAKE_COMPILER_IS_MINGW)
>-        list(APPEND EXTRA_LIBS dxerr8)
>-      else()
>-        list(APPEND EXTRA_LIBS dxerr)
>-      endif()
>     endif()
>     if(HAVE_XINPUT_H)
>       set(SDL_JOYSTICK_XINPUT 1)

Actions: View | Diff

Attachments on bug 3080: 2340

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.