瀏覽代碼

Fix building with shared_ptr on Windows. Also updating project files to last changes.

Joachim Meyer 9 年之前
父節點
當前提交
57cb01d606

+ 2 - 6
build/windows/win32/PolycodeCore/PolycodeCore.vcxproj

@@ -176,14 +176,12 @@
     <ClCompile Include="..\..\..\..\src\core\PolyEventDispatcher.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyEventHandler.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyFont.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\PolyFontGlyphSheet.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyGPUDrawBuffer.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyImage.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyInputEvent.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyLabel.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyLogger.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyMaterial.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\PolyMaterialManager.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyMatrix4.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyMesh.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyObject.cpp" />
@@ -203,7 +201,6 @@
     <ClCompile Include="..\..\..\..\src\core\PolyResourceManager.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyScene.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolySceneEntityInstance.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\PolySceneImage.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolySceneLabel.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolySceneLight.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolySceneLine.cpp" />
@@ -237,6 +234,7 @@
     <ClCompile Include="..\..\..\..\src\core\tinyxmlerror.cpp" />
     <ClCompile Include="..\..\..\..\src\core\tinyxmlparser.cpp" />
     <ClCompile Include="..\..\..\..\src\duktape\duktape.cpp" />
+    <ClCompile Include="..\..\..\..\src\view\win32\PolycodeView.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\Polycode.h" />
@@ -258,7 +256,6 @@
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyEventDispatcher.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyEventHandler.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyFont.h" />
-    <ClInclude Include="..\..\..\..\include\polycode\core\PolyFontGlyphSheet.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyGlobals.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyGPUDrawBuffer.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyImage.h" />
@@ -267,7 +264,6 @@
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyLabel.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyLogger.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyMaterial.h" />
-    <ClInclude Include="..\..\..\..\include\polycode\core\PolyMaterialManager.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyMatrix4.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyMesh.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyObject.h" />
@@ -287,7 +283,6 @@
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyResourceManager.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyScene.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolySceneEntityInstance.h" />
-    <ClInclude Include="..\..\..\..\include\polycode\core\PolySceneImage.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolySceneLabel.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolySceneLight.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolySceneLine.h" />
@@ -315,6 +310,7 @@
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyVector3.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyVector4.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyWinCore.h" />
+    <ClInclude Include="..\..\..\..\include\polycode\view\win32\PolycodeView.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

+ 6 - 18
build/windows/win32/PolycodeCore/PolycodeCore.vcxproj.filters

@@ -138,9 +138,6 @@
     <ClCompile Include="..\..\..\..\src\core\PolyFont.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\core\PolyFontGlyphSheet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\core\PolyGPUDrawBuffer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -159,9 +156,6 @@
     <ClCompile Include="..\..\..\..\src\core\PolyMaterial.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\core\PolyMaterialManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\core\PolyMatrix4.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -219,9 +213,6 @@
     <ClCompile Include="..\..\..\..\src\core\PolySceneEntityInstance.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\core\PolySceneImage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\core\PolySceneLabel.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -264,14 +255,14 @@
     <ClCompile Include="..\..\..\..\src\core\PolyScript.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\view\win32\PolycodeView.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyFont.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\polycode\core\PolyFontGlyphSheet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyGlobals.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -296,9 +287,6 @@
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyMaterial.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\polycode\core\PolyMaterialManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyMatrix4.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -356,9 +344,6 @@
     <ClInclude Include="..\..\..\..\include\polycode\core\PolySceneEntityInstance.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\polycode\core\PolySceneImage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\polycode\core\PolySceneLabel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -494,5 +479,8 @@
     <ClInclude Include="..\..\..\..\include\Polycode.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\polycode\view\win32\PolycodeView.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

+ 0 - 2
build/windows/win32/TemplateApp/TemplateApp.vcxproj

@@ -173,12 +173,10 @@ if not exist "$(TargetDir)glew32.dll" copy "..\..\..\..\lib\win32\$(PlatformTarg
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\view\win32\PolycodeView.cpp" />
     <ClCompile Include="PolycodeTemplateApp.cpp" />
     <ClCompile Include="TemplateApp.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\polycode\view\win32\PolycodeView.h" />
     <ClInclude Include="PolycodeTemplateApp.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+ 0 - 6
build/windows/win32/TemplateApp/TemplateApp.vcxproj.filters

@@ -18,9 +18,6 @@
     <ClCompile Include="PolycodeTemplateApp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\view\win32\PolycodeView.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="TemplateApp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -29,8 +26,5 @@
     <ClInclude Include="PolycodeTemplateApp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\polycode\view\win32\PolycodeView.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>

+ 1 - 0
include/polycode/core/PolyCubemap.h

@@ -23,6 +23,7 @@ THE SOFTWARE.
 #pragma once
 #include "polycode/core/PolyGlobals.h"
 #include "polycode/core/PolyResource.h"
+#include <memory>
 
 namespace Polycode {