- Enable MSVC build of mesa, telnet, explorer and rosautotest
CORE-6950 #resolve

svn path=/trunk/; revision=59291
This commit is contained in:
Thomas Faber 2013-06-22 16:38:27 +00:00
parent e9df952de3
commit b6ce4e511a
7 changed files with 7 additions and 15 deletions

View file

@ -10,9 +10,7 @@ add_subdirectory(netstat)
add_subdirectory(nslookup) add_subdirectory(nslookup)
add_subdirectory(ping) add_subdirectory(ping)
add_subdirectory(route) add_subdirectory(route)
if(NOT MSVC) add_subdirectory(telnet)
add_subdirectory(telnet) # FIXME: fix msvc build
endif()
add_subdirectory(tracert) add_subdirectory(tracert)
add_subdirectory(whois) add_subdirectory(whois)
add_subdirectory(wlanconf) add_subdirectory(wlanconf)

View file

@ -1,5 +1,5 @@
set_cpp(WITH_STL) set_cpp(WITH_EXCEPTIONS WITH_STL)
add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
@ -27,7 +27,7 @@ add_executable(telnet
set_module_type(telnet win32cui) set_module_type(telnet win32cui)
add_pch(telnet src/precomp.h) 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) add_cd_file(TARGET telnet DESTINATION reactos/system32 FOR all)
if(NOT MSVC) if(NOT MSVC)

View file

@ -18,7 +18,7 @@
//#include <stdio.h> //#include <stdio.h>
//#include <stdarg.h> //#include <stdarg.h>
//#include <string.h> //#include <string.h>
//#include <locale.h> #include <locale.h>
#include <io.h> #include <io.h>
#include <time.h> #include <time.h>
//#include <ctype.h> //#include <ctype.h>

View file

@ -1,7 +1,4 @@
add_subdirectory(cmd) add_subdirectory(cmd)
if(NOT MSVC)
add_subdirectory(explorer) add_subdirectory(explorer)
endif()
add_subdirectory(explorer-new) add_subdirectory(explorer-new)

View file

@ -1,5 +1,3 @@
add_subdirectory(glu32) add_subdirectory(glu32)
if(NOT MSVC) add_subdirectory(mesa)
add_subdirectory(mesa)
endif()
add_subdirectory(opengl32) add_subdirectory(opengl32)

View file

@ -5,9 +5,7 @@ add_subdirectory(apitests)
#add_subdirectory(dxtest) #add_subdirectory(dxtest)
add_subdirectory(kmtests) add_subdirectory(kmtests)
#add_subdirectory(regtests) #add_subdirectory(regtests)
if(NOT MSVC) # FIXME: msvc build add_subdirectory(rosautotest)
add_subdirectory(rosautotest)
endif()
add_subdirectory(tests) add_subdirectory(tests)
#add_subdirectory(win32) #add_subdirectory(win32)
add_subdirectory(winetests) add_subdirectory(winetests)

View file

@ -2,6 +2,7 @@
#include <iostream> #include <iostream>
#include <memory> #include <memory>
#include <sstream> #include <sstream>
#include <string>
#include <vector> #include <vector>
#include <iomanip> #include <iomanip>