suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix VS2010 build errors

Browse Source 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5324 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
wmayer 2011-12-19 11:45:00 +00:00
parent 889e0a3016
commit 92233011a9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/App/Application.cpp
View File

@ -43,7 +43,7 @@
#ifdef FC_OS_WIN32
# include <Shlobj.h>
// Doesn't seem to work with VS2010
# if (defined(_MSC_VER) && (_MSC_VER < 1800))
# if (defined(_MSC_VER) && (_MSC_VER < 1600))
# include <Shfolder.h>
# endif
#endif
@ -1287,8 +1287,9 @@ void Application::LoadParameters(void)
}
#if (defined(_MSC_VER) && (_MSC_VER != 1600))
#if defined(_MSC_VER)
// fix weird error while linking boost (all versions of VC)
// VS2010: https://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=4&t=1886&p=12553&hilit=boost%3A%3Afilesystem%3A%3Aget#p12553
namespace boost { namespace program_options { std::string arg="arg"; } }
#if (defined (BOOST_VERSION) && (BOOST_VERSION == 104100))
namespace boost { namespace program_options {

2
src/zipios++/dircoll.cpp
View File

@ -134,7 +134,7 @@ void DirectoryCollection::load( bool recursive, const FilePath &subdir ) {
if ( *it == "." || *it == ".." || *it == "..." )
continue ;
# if (defined(_MSC_VER) && (_MSC_VER >= 1800))
# if (defined(_MSC_VER) && (_MSC_VER >= 1600))
if ( boost::filesystem::get< is_directory >( it ) && recursive ) {
load( recursive, subdir + *it ) ;
} else {