From b6ce4e511a55a1d235d89916f528b0e1844b6a8a Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Sat, 22 Jun 2013 16:38:27 +0000
Subject: [PATCH] [C++] - Enable MSVC build of mesa, telnet, explorer and
 rosautotest CORE-6950 #resolve

svn path=/trunk/; revision=59291
---
 reactos/base/applications/network/CMakeLists.txt        | 4 +---
 reactos/base/applications/network/telnet/CMakeLists.txt | 4 ++--
 reactos/base/applications/network/telnet/src/precomp.h  | 2 +-
 reactos/base/shell/CMakeLists.txt                       | 3 ---
 reactos/dll/opengl/CMakeLists.txt                       | 4 +---
 rostests/CMakeLists.txt                                 | 4 +---
 rostests/rosautotest/precomp.h                          | 1 +
 7 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/reactos/base/applications/network/CMakeLists.txt b/reactos/base/applications/network/CMakeLists.txt
index dc22e24020a..4f95614999e 100644
--- a/reactos/base/applications/network/CMakeLists.txt
+++ b/reactos/base/applications/network/CMakeLists.txt
@@ -10,9 +10,7 @@ add_subdirectory(netstat)
 add_subdirectory(nslookup)
 add_subdirectory(ping)
 add_subdirectory(route)
-if(NOT MSVC)
-    add_subdirectory(telnet) # FIXME: fix msvc build
-endif()
+add_subdirectory(telnet)
 add_subdirectory(tracert)
 add_subdirectory(whois)
 add_subdirectory(wlanconf)
diff --git a/reactos/base/applications/network/telnet/CMakeLists.txt b/reactos/base/applications/network/telnet/CMakeLists.txt
index 8f1af80c28a..672a0de7130 100644
--- a/reactos/base/applications/network/telnet/CMakeLists.txt
+++ b/reactos/base/applications/network/telnet/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-set_cpp(WITH_STL)
+set_cpp(WITH_EXCEPTIONS WITH_STL)
 
 add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
 
@@ -27,7 +27,7 @@ add_executable(telnet
 
 set_module_type(telnet win32cui)
 add_pch(telnet src/precomp.h)
-add_importlibs(telnet ws2_32 user32 msvcrt kernel32)
+add_importlibs(telnet ws2_32 user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET telnet DESTINATION reactos/system32 FOR all)
 
 if(NOT MSVC)
diff --git a/reactos/base/applications/network/telnet/src/precomp.h b/reactos/base/applications/network/telnet/src/precomp.h
index 8691fbb04f3..1c8f9001f96 100644
--- a/reactos/base/applications/network/telnet/src/precomp.h
+++ b/reactos/base/applications/network/telnet/src/precomp.h
@@ -18,7 +18,7 @@
 //#include <stdio.h>
 //#include <stdarg.h>
 //#include <string.h>
-//#include <locale.h>
+#include <locale.h>
 #include <io.h>
 #include <time.h>
 //#include <ctype.h>
diff --git a/reactos/base/shell/CMakeLists.txt b/reactos/base/shell/CMakeLists.txt
index 4849ec112a6..dc06a56fcda 100644
--- a/reactos/base/shell/CMakeLists.txt
+++ b/reactos/base/shell/CMakeLists.txt
@@ -1,7 +1,4 @@
 
 add_subdirectory(cmd)
-if(NOT MSVC)
 add_subdirectory(explorer)
-endif()
 add_subdirectory(explorer-new)
-
diff --git a/reactos/dll/opengl/CMakeLists.txt b/reactos/dll/opengl/CMakeLists.txt
index 3f0ba3ee508..fe197437dfb 100644
--- a/reactos/dll/opengl/CMakeLists.txt
+++ b/reactos/dll/opengl/CMakeLists.txt
@@ -1,5 +1,3 @@
 add_subdirectory(glu32)
-if(NOT MSVC)
-    add_subdirectory(mesa)
-endif()
+add_subdirectory(mesa)
 add_subdirectory(opengl32)
diff --git a/rostests/CMakeLists.txt b/rostests/CMakeLists.txt
index aa461f3a72f..b52b25d5f8c 100644
--- a/rostests/CMakeLists.txt
+++ b/rostests/CMakeLists.txt
@@ -5,9 +5,7 @@ add_subdirectory(apitests)
 #add_subdirectory(dxtest)
 add_subdirectory(kmtests)
 #add_subdirectory(regtests)
-if(NOT MSVC) # FIXME: msvc build
-    add_subdirectory(rosautotest)
-endif()
+add_subdirectory(rosautotest)
 add_subdirectory(tests)
 #add_subdirectory(win32)
 add_subdirectory(winetests)
diff --git a/rostests/rosautotest/precomp.h b/rostests/rosautotest/precomp.h
index 1960bc6e6ba..301e4ab8b8c 100644
--- a/rostests/rosautotest/precomp.h
+++ b/rostests/rosautotest/precomp.h
@@ -2,6 +2,7 @@
 #include <iostream>
 #include <memory>
 #include <sstream>
+#include <string>
 #include <vector>
 #include <iomanip>