From 6d8fefe38077f4d532c256e79cfcaf2a46c5269d Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 12 Nov 2013 16:58:49 +0100 Subject: Now use visual studio 2013 express edition for compilation --- xorg-server/dix/devices.c | 4 ---- xorg-server/dix/getevents.c | 4 ---- xorg-server/hw/xwin/xlaunch/window/util.cc | 21 ++++++++++----------- xorg-server/installer/packageall.bat | 24 ++++++++++++------------ xorg-server/installer/vcxsrv-64-debug.nsi | 8 ++++++-- xorg-server/installer/vcxsrv-64.nsi | 16 ++++++++++------ xorg-server/installer/vcxsrv-debug.nsi | 8 ++++++-- xorg-server/installer/vcxsrv.nsi | 16 ++++++++++------ xorg-server/mi/miarc.c | 1 + 9 files changed, 55 insertions(+), 47 deletions(-) (limited to 'xorg-server') diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c index c5c8daafe..1f5193c1b 100644 --- a/xorg-server/dix/devices.c +++ b/xorg-server/dix/devices.c @@ -86,10 +86,6 @@ SOFTWARE. #include "xichangehierarchy.h" /* For XISendDeviceHierarchyEvent */ #include "syncsrv.h" -#ifdef _MSC_VER -#define isfinite(val) _finite(val) -#endif - /** @file * This file handles input device-related stuff. */ diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index dd99c2895..3b87e17d4 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -78,10 +78,6 @@ typedef const char *string; #ifdef _MSC_VER #include -float roundf(float f) -{ - return ((f<0.0f) ? ceil(f-.5) : floor (f+.5)); -} double roundd(double f) { return ((f<0.0) ? ceil(f-.5) : floor (f+.5)); diff --git a/xorg-server/hw/xwin/xlaunch/window/util.cc b/xorg-server/hw/xwin/xlaunch/window/util.cc index 6f768348e..c01b782fc 100644 --- a/xorg-server/hw/xwin/xlaunch/window/util.cc +++ b/xorg-server/hw/xwin/xlaunch/window/util.cc @@ -30,9 +30,9 @@ const char * MessageDebug::notify_names[NOTIFY_NAMES_LEN]; std::string win32_error::message(DWORD errorcode) { LPVOID lpMsgBuf; - if (!FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | + if (!FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errorcode, @@ -68,19 +68,19 @@ void MessageDebug::debug(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, con LPNMHDR pnmh = (LPNMHDR)lParam; int psn_index = -(int)pnmh->code - 200; if (psn_index >= 0 && psn_index < 10 && psn_notify[psn_index]) - printf("%s: %08x %04x WM_NOTIFY (%s)\n", prefix, hwnd, wParam, psn_notify[psn_index]); + printf("%s: %p %04x WM_NOTIFY (%s)\n", prefix, hwnd, wParam, psn_notify[psn_index]); else if (pnmh->code < NOTIFY_NAMES_LEN && notify_names[pnmh->code]) - printf("%s: %08x %04x WM_NOTIFY (%s)\n", prefix, hwnd, wParam, notify_names[pnmh->code]); + printf("%s: %p %04x WM_NOTIFY (%s)\n", prefix, hwnd, wParam, notify_names[pnmh->code]); else - printf("%s: %08x %04x WM_NOTIFY (%u)\n", prefix, hwnd, wParam, pnmh->code); - } + printf("%s: %p %04x WM_NOTIFY (%u)\n", prefix, hwnd, wParam, pnmh->code); + } else if (uMsg >= MESSAGE_NAMES_LEN) if (uMsg >= WM_USER) - printf("%s: %08x %04x %08x WM_USER + %d\n", prefix, hwnd, wParam, lParam, uMsg - WM_USER); + printf("%s: %p %04x %08x WM_USER + %d\n", prefix, hwnd, wParam, lParam, uMsg - WM_USER); else - printf("%s: %08x %04x %08x %d\n", prefix, hwnd, wParam, lParam, uMsg); + printf("%s: %p %04x %08x %d\n", prefix, hwnd, wParam, lParam, uMsg); else if (uMsg >= 0 && uMsg < MESSAGE_NAMES_LEN && message_names[uMsg]) - printf("%s: %08x %04x %08x %s\n", prefix, hwnd, wParam, lParam, message_names[uMsg]); + printf("%s: %p %04x %08x %s\n", prefix, hwnd, wParam, lParam, message_names[uMsg]); #endif } @@ -1111,4 +1111,3 @@ const char * MessageDebug::message_names[MESSAGE_NAMES_LEN] = { "1022", "1023" }; - diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat index d8b245029..5e9677e6e 100755 --- a/xorg-server/installer/packageall.bat +++ b/xorg-server/installer/packageall.bat @@ -3,10 +3,10 @@ if exist vcxsrv*.installer.exe del vcxsrv*.installer.exe if "%1"=="nox86" goto skipx86 -copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x86\Microsoft.VC110.CRT\msvcp110.dll" -copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x86\Microsoft.VC110.CRT\msvcr110.dll" -copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC110.DebugCRT\msvcp110d.dll" -copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC110.DebugCRT\msvcr110d.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvcp120.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvcr120.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC120.DebugCRT\msvcp120d.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC120.DebugCRT\msvcr120d.dll" if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv.nsi @@ -19,10 +19,10 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( :skipx86 if "%1"=="nox64" goto skipx64 -copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x64\Microsoft.VC110.CRT\msvcp110.dll" -copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x64\Microsoft.VC110.CRT\msvcr110.dll" -copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC110.DebugCRT\msvcp110d.dll" -copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC110.DebugCRT\msvcr110d.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcp120.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcr120.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC120.DebugCRT\msvcp120d.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC120.DebugCRT\msvcr120d.dll" if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-64.nsi @@ -34,7 +34,7 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( :skipx64 -del msvcr110.dll -del msvcr110d.dll -del msvcp110.dll -del msvcp110d.dll +del msvcr120.dll +del msvcr120d.dll +del msvcp120.dll +del msvcp120d.dll diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi index 470d9c6b8..f93a32c78 100644 --- a/xorg-server/installer/vcxsrv-64-debug.nsi +++ b/xorg-server/installer/vcxsrv-64-debug.nsi @@ -65,6 +65,10 @@ Section "VcXsrv debug exe and dlls" Delete "$INSTDIR\msvcr100d.dll" IfFileExists "$INSTDIR\msvcp100d.dll" 0 +2 Delete "$INSTDIR\msvcp100d.dll" + IfFileExists "$INSTDIR\msvcr110d.dll" 0 +2 + Delete "$INSTDIR\msvcr110d.dll" + IfFileExists "$INSTDIR\msvcp110d.dll" 0 +2 + Delete "$INSTDIR\msvcp110d.dll" ; Put files there File "..\obj64\servdebug\vcxsrv.exe" @@ -86,8 +90,8 @@ Section "VcXsrv debug exe and dlls" File "..\..\libX11\obj64\debug\libX11.dll" File "..\..\libXext\src\obj64\debug\libXext.dll" File "..\..\libXmu\src\obj64\debug\libXmu.dll" - File "msvcr110d.dll" - File "msvcp110d.dll" + File "msvcr120d.dll" + File "msvcp120d.dll" WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir_64" $INSTDIR SectionEnd diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi index 9c04e3ef8..d452c0634 100644 --- a/xorg-server/installer/vcxsrv-64.nsi +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -69,6 +69,10 @@ Section "VcXsrv (required)" Delete "$INSTDIR\msvcr100.dll" IfFileExists "$INSTDIR\msvcp100.dll" 0 +2 Delete "$INSTDIR\msvcp100.dll" + IfFileExists "$INSTDIR\msvcr110.dll" 0 +2 + Delete "$INSTDIR\msvcr110.dll" + IfFileExists "$INSTDIR\msvcp110.dll" 0 +2 + Delete "$INSTDIR\msvcp110.dll" ; Put files there File "..\obj64\servrelease\vcxsrv.exe" @@ -105,8 +109,8 @@ Section "VcXsrv (required)" File "..\..\libX11\obj64\release\libX11.dll" File "..\..\libXext\src\obj64\release\libXext.dll" File "..\..\libXmu\src\obj64\release\libXmu.dll" - File "msvcr110.dll" - File "msvcp110.dll" + File "msvcr120.dll" + File "msvcp120.dll" SetOutPath $INSTDIR\xkbdata File /r "..\xkbdata\*.*" SetOutPath $INSTDIR\locale @@ -230,10 +234,10 @@ Section "Uninstall" Delete "$INSTDIR\libxml2.dll" Delete "$INSTDIR\zlib1.dll" Delete "$INSTDIR\iconv.dll" - Delete "$INSTDIR\msvcr110.dll" - Delete "$INSTDIR\msvcp110.dll" - Delete "$INSTDIR\msvcr110d.dll" - Delete "$INSTDIR\msvcp110d.dll" + Delete "$INSTDIR\msvcr120.dll" + Delete "$INSTDIR\msvcp120.dll" + Delete "$INSTDIR\msvcr120d.dll" + Delete "$INSTDIR\msvcp120d.dll" RMDir /r "$INSTDIR\fonts" RMDir /r "$INSTDIR\xkbdata" diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi index 8a3ea204a..7ca89fd61 100644 --- a/xorg-server/installer/vcxsrv-debug.nsi +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -65,6 +65,10 @@ Section "VcXsrv debug exe and dlls" Delete "$INSTDIR\msvcr100d.dll" IfFileExists "$INSTDIR\msvcp100d.dll" 0 +2 Delete "$INSTDIR\msvcp100d.dll" + IfFileExists "$INSTDIR\msvcr110d.dll" 0 +2 + Delete "$INSTDIR\msvcr110d.dll" + IfFileExists "$INSTDIR\msvcp110d.dll" 0 +2 + Delete "$INSTDIR\msvcp110d.dll" ; Put files there File "..\obj\servdebug\vcxsrv.exe" @@ -86,8 +90,8 @@ Section "VcXsrv debug exe and dlls" File "..\..\libX11\obj\debug\libX11.dll" File "..\..\libXext\src\obj\debug\libXext.dll" File "..\..\libXmu\src\obj\debug\libXmu.dll" - File "msvcr110d.dll" - File "msvcp110d.dll" + File "msvcr120d.dll" + File "msvcp120d.dll" WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir" "$INSTDIR" SectionEnd diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index f7e02a9ce..54186a3b9 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -69,6 +69,10 @@ Section "VcXsrv (required)" Delete "$INSTDIR\msvcr100.dll" IfFileExists "$INSTDIR\msvcp100.dll" 0 +2 Delete "$INSTDIR\msvcp100.dll" + IfFileExists "$INSTDIR\msvcr110.dll" 0 +2 + Delete "$INSTDIR\msvcr110.dll" + IfFileExists "$INSTDIR\msvcp110.dll" 0 +2 + Delete "$INSTDIR\msvcp110.dll" ; Put files there File "..\obj\servrelease\vcxsrv.exe" @@ -105,8 +109,8 @@ Section "VcXsrv (required)" File "..\..\libX11\obj\release\libX11.dll" File "..\..\libXext\src\obj\release\libXext.dll" File "..\..\libXmu\src\obj\release\libXmu.dll" - File "msvcr110.dll" - File "msvcp110.dll" + File "msvcr120.dll" + File "msvcp120.dll" SetOutPath $INSTDIR\xkbdata File /r "..\xkbdata\*.*" SetOutPath $INSTDIR\locale @@ -230,10 +234,10 @@ Section "Uninstall" Delete "$INSTDIR\libxml2.dll" Delete "$INSTDIR\zlib1.dll" Delete "$INSTDIR\iconv.dll" - Delete "$INSTDIR\msvcr110.dll" - Delete "$INSTDIR\msvcp110.dll" - Delete "$INSTDIR\msvcr110d.dll" - Delete "$INSTDIR\msvcp110d.dll" + Delete "$INSTDIR\msvcr120.dll" + Delete "$INSTDIR\msvcp120.dll" + Delete "$INSTDIR\msvcr120d.dll" + Delete "$INSTDIR\msvcp120d.dll" RMDir /r "$INSTDIR\fonts" RMDir /r "$INSTDIR\xkbdata" diff --git a/xorg-server/mi/miarc.c b/xorg-server/mi/miarc.c index a73bce9e6..edb80bfe3 100644 --- a/xorg-server/mi/miarc.c +++ b/xorg-server/mi/miarc.c @@ -65,6 +65,7 @@ SOFTWARE. #ifdef _MSC_VER #define hypot _hypot +#define HAVE_CBRT #endif static double miDsin(double a); -- cgit v1.2.3