dmuratshin 9 years ago
parent
commit
0337feaa4e

+ 4 - 0
.gitignore

@@ -8,3 +8,7 @@ examples/HelloFreeType/proj.android/libs/
 examples/HelloFreeType/proj.android/bin/
 examples/HelloFreeType/proj.android/bin/
 examples/HelloFreeType/proj.android/gen/org/oxygine/HelloFreeType/R.java
 examples/HelloFreeType/proj.android/gen/org/oxygine/HelloFreeType/R.java
 examples/HelloFreeType/proj.android/gen/
 examples/HelloFreeType/proj.android/gen/
+examples/HelloFreeType/proj.cmake/build_emsc/
+examples/HelloFreeType/proj.win32/Debug_v*
+*.sdf
+*.opensdf

+ 1 - 1
examples/HelloFreeType/proj.win32/HelloFreeType.vcxproj

@@ -110,9 +110,9 @@
     </ProjectReference>
     </ProjectReference>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <ClCompile Include="../src/entry_point.cpp" />
     <ClCompile Include="../src/example.cpp" />
     <ClCompile Include="../src/example.cpp" />
     <ClCompile Include="..\..\..\src\ResFontFT.cpp" />
     <ClCompile Include="..\..\..\src\ResFontFT.cpp" />
+    <ClCompile Include="..\src\main.cpp" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <ClInclude Include="../src/example.h" />
     <ClInclude Include="../src/example.h" />

+ 3 - 3
examples/HelloFreeType/proj.win32/HelloFreeType.vcxproj.filters

@@ -18,15 +18,15 @@
     </Filter>
     </Filter>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <ClCompile Include="../src/entry_point.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="../src/example.cpp">
     <ClCompile Include="../src/example.cpp">
       <Filter>Source Files</Filter>
       <Filter>Source Files</Filter>
     </ClCompile>
     </ClCompile>
     <ClCompile Include="..\..\..\src\ResFontFT.cpp">
     <ClCompile Include="..\..\..\src\ResFontFT.cpp">
       <Filter>freetype</Filter>
       <Filter>freetype</Filter>
     </ClCompile>
     </ClCompile>
+    <ClCompile Include="..\src\main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <ClInclude Include="../src/example.h">
     <ClInclude Include="../src/example.h">

+ 2 - 0
src/ResFontFT.cpp

@@ -106,7 +106,9 @@ namespace oxygine
 		FontFT(ResFontFT *rs, int size) :_rs(rs), _size(size)
 		FontFT(ResFontFT *rs, int size) :_rs(rs), _size(size)
 		{
 		{
 			init("abc", size, size, size);
 			init("abc", size, size, size);
+#if !defined(_MSC_VER) ||  (_MSC_VER >= 1900)
 			_glyphs.reserve(100);
 			_glyphs.reserve(100);
+#endif
 		}
 		}
 
 
 	protected:
 	protected: