• R/O
  • HTTP
  • SSH
  • HTTPS

meshio: Commit

3D model(pmd, mqo...) IO library using C++.


Commit MetaInfo

Revisionf3260fdc3454cde02ac901955a1d0cd867aa8508 (tree)
Time2012-03-07 23:33:30
Authorousttrue <ousttrue@gmai...>
Commiterousttrue

Log Message

clean up for vs2010

Change Summary

Incremental Difference

--- a/src/binary.cpp
+++ b/src/binary.cpp
@@ -19,12 +19,12 @@ namespace meshio {
1919 return 0;
2020 }
2121 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){
2424 eof_=true;
2525 }
26- pos_+=size;
27- return size;
26+ pos_+=read_size;
27+ return read_size;
2828 }
2929
3030 unsigned int FileReader::getPos()const
--- a/src/pmd.h
+++ b/src/pmd.h
@@ -37,14 +37,7 @@
3737 #include "binary.h"
3838 #include <ostream>
3939 #include <vector>
40-#ifdef _MSC_VER
41-#include <boost/array.hpp>
42-namespace std {
43- using boost::array;
44-}
45-#else
4640 #include <array>
47-#endif
4841
4942 namespace meshio {
5043 namespace pmd {
--- a/src/premake4.lua
+++ b/src/premake4.lua
@@ -1,13 +1,31 @@
11 solution "meshio"
22 configurations { "Debug", "Release" }
33
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+
424 configuration "Debug"
525 do
626 targetdir "../debug"
727 flags { "Symbols" }
8- buildoptions { "-g", "-Wall" }
928 defines { "DEBUG" }
10- linkoptions { "-g" }
1129 end
1230
1331 configuration "Release"
@@ -17,7 +35,6 @@ do
1735 defines { "NDEBUG" }
1836 end
1937
20-
2138 -- A project defines one build target
2239 project "meshio"
2340 --kind "WindowedApp"
@@ -37,18 +54,3 @@ linkoptions {}
3754 libdirs {}
3855 links {}
3956
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-
Show on old repository browser