[ros-diffs] [tfaber] 59291: [C++] - Enable MSVC build of mesa, telnet, explorer and rosautotest CORE-6950 #resolve

Author: tfaber
Date: Sat Jun 22 16:38:27 2013
New Revision: 59291

URL: http://svn.reactos.org/svn/reactos?rev=59291&view=rev
Log:
[C++]
- Enable MSVC build of mesa, telnet, explorer and rosautotest
CORE-6950 #resolve

Modified:
    trunk/reactos/base/applications/network/CMakeLists.txt
    trunk/reactos/base/applications/network/telnet/CMakeLists.txt
    trunk/reactos/base/applications/network/telnet/src/precomp.h
    trunk/reactos/base/shell/CMakeLists.txt
    trunk/reactos/dll/opengl/CMakeLists.txt
    trunk/rostests/CMakeLists.txt
    trunk/rostests/rosautotest/precomp.h

Modified: trunk/reactos/base/applications/network/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/CMakeLists.txt	[iso-8859-1] Sat Jun 22
16:38:27 2013
@@ -10,9 +10,7 @@
 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)

Modified: trunk/reactos/base/applications/network/telnet/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/telnet/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/telnet/CMakeLists.txt	[iso-8859-1] Sat Jun 22
16:38:27 2013
@@ -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 @@
 
 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)

Modified: trunk/reactos/base/applications/network/telnet/src/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/telnet/src/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/telnet/src/precomp.h	[iso-8859-1] Sat Jun 22
16:38:27 2013
@@ -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>

Modified: trunk/reactos/base/shell/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/CMakeLists.txt?…
==============================================================================
--- trunk/reactos/base/shell/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/CMakeLists.txt	[iso-8859-1] Sat Jun 22 16:38:27 2013
@@ -1,7 +1,4 @@
 
 add_subdirectory(cmd)
-if(NOT MSVC)
 add_subdirectory(explorer)
-endif()
 add_subdirectory(explorer-new)
-

Modified: trunk/reactos/dll/opengl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/CMakeLists.txt?…
==============================================================================
--- trunk/reactos/dll/opengl/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/CMakeLists.txt	[iso-8859-1] Sat Jun 22 16:38:27 2013
@@ -1,5 +1,3 @@
 add_subdirectory(glu32)
-if(NOT MSVC)
-    add_subdirectory(mesa)
-endif()
+add_subdirectory(mesa)
 add_subdirectory(opengl32)

Modified: trunk/rostests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=59291&…
==============================================================================
--- trunk/rostests/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/CMakeLists.txt	[iso-8859-1] Sat Jun 22 16:38:27 2013
@@ -5,9 +5,7 @@
 #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)

Modified: trunk/rostests/rosautotest/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev…
==============================================================================
--- trunk/rostests/rosautotest/precomp.h	[iso-8859-1] (original)
+++ trunk/rostests/rosautotest/precomp.h	[iso-8859-1] Sat Jun 22 16:38:27 2013
@@ -2,6 +2,7 @@
 #include <iostream>
 #include <memory>
 #include <sstream>
+#include <string>
 #include <vector>
 #include <iomanip>