| Revision | f3260fdc3454cde02ac901955a1d0cd867aa8508 (tree) |
|---|---|
| Time | 2012-03-07 23:33:30 |
| Author | ousttrue <ousttrue@gmai...> |
| Commiter | ousttrue |
clean up for vs2010
src/binary.cpp (diff)
src/pmd.h (diff)
src/premake4.lua (diff)| @@ -19,12 +19,12 @@ namespace meshio { | ||
| 19 | 19 | return 0; |
| 20 | 20 | } |
| 21 | 21 | io_.read(buf, size); |
| 22 | - size=io_.gcount(); | |
| 23 | - if(size==0){ | |
| 22 | + size_t read_size=static_cast<size_t>(io_.gcount()); | |
| 23 | + if(read_size==0){ | |
| 24 | 24 | eof_=true; |
| 25 | 25 | } |
| 26 | - pos_+=size; | |
| 27 | - return size; | |
| 26 | + pos_+=read_size; | |
| 27 | + return read_size; | |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | unsigned int FileReader::getPos()const |
| @@ -37,14 +37,7 @@ | ||
| 37 | 37 | #include "binary.h" |
| 38 | 38 | #include <ostream> |
| 39 | 39 | #include <vector> |
| 40 | -#ifdef _MSC_VER | |
| 41 | -#include <boost/array.hpp> | |
| 42 | -namespace std { | |
| 43 | - using boost::array; | |
| 44 | -} | |
| 45 | -#else | |
| 46 | 40 | #include <array> |
| 47 | -#endif | |
| 48 | 41 | |
| 49 | 42 | namespace meshio { |
| 50 | 43 | namespace pmd { |
| @@ -1,13 +1,31 @@ | ||
| 1 | 1 | solution "meshio" |
| 2 | 2 | configurations { "Debug", "Release" } |
| 3 | 3 | |
| 4 | +configuration { "vs*" } | |
| 5 | +do | |
| 6 | + buildoptions { | |
| 7 | + "/wd4996", | |
| 8 | + } | |
| 9 | +end | |
| 10 | + | |
| 11 | +configuration { "gmake" } | |
| 12 | +do | |
| 13 | + buildoptions { | |
| 14 | + "-std=c++0x", | |
| 15 | + } | |
| 16 | +end | |
| 17 | + | |
| 18 | +configuration "Debug gmake" | |
| 19 | +do | |
| 20 | + buildoptions { "-g", "-Wall" } | |
| 21 | + linkoptions { "-g" } | |
| 22 | +end | |
| 23 | + | |
| 4 | 24 | configuration "Debug" |
| 5 | 25 | do |
| 6 | 26 | targetdir "../debug" |
| 7 | 27 | flags { "Symbols" } |
| 8 | - buildoptions { "-g", "-Wall" } | |
| 9 | 28 | defines { "DEBUG" } |
| 10 | - linkoptions { "-g" } | |
| 11 | 29 | end |
| 12 | 30 | |
| 13 | 31 | configuration "Release" |
| @@ -17,7 +35,6 @@ do | ||
| 17 | 35 | defines { "NDEBUG" } |
| 18 | 36 | end |
| 19 | 37 | |
| 20 | - | |
| 21 | 38 | -- A project defines one build target |
| 22 | 39 | project "meshio" |
| 23 | 40 | --kind "WindowedApp" |
| @@ -37,18 +54,3 @@ linkoptions {} | ||
| 37 | 54 | libdirs {} |
| 38 | 55 | links {} |
| 39 | 56 | |
| 40 | -configuration { "windows", "not gmake" } | |
| 41 | -do | |
| 42 | - -- VC | |
| 43 | - buildoptions { | |
| 44 | - "/wd4996", | |
| 45 | - } | |
| 46 | -end | |
| 47 | - | |
| 48 | -configuration { "gmake" } | |
| 49 | -do | |
| 50 | - buildoptions { | |
| 51 | - "-std=c++0x", | |
| 52 | - } | |
| 53 | -end | |
| 54 | - |
Fork