dm 6 лет назад
Родитель
Сommit
f304622009

+ 2 - 0
.gitignore

@@ -9,3 +9,5 @@ examples/HelloViewerAE/data/viewer.log
 examples/HelloViewerAE/proj.android/.gradle/
 examples/HelloViewerAE/proj.android/build/
 examples/HelloViewerAE/proj.android/.externalNativeBuild/
+examples/HelloViewerAE/proj.win32/.vs/
+examples/HelloViewerAE/proj.win32/Debug_v141/

+ 36 - 14
examples/HelloViewerAE/proj.win32/HelloViewerAE.vcxproj

@@ -17,8 +17,6 @@
     <ProjectName>HelloViewerAE</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -36,11 +34,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <WholeProgramOptimization Condition="'$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '14.0'">true</WholeProgramOptimization>
-    
-
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
@@ -62,15 +57,12 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-
   <PropertyGroup>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)_$(PlatformToolset)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)_$(PlatformToolset)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)_$(PlatformToolset)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)_$(PlatformToolset)\</IntDir>
   </PropertyGroup>
-
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
@@ -84,12 +76,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../oxygine-framework//oxygine/src;../../../..//SDL/include;../../../../oxygine-framework//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../oxygine-framework//oxygine/src;../../../..//SDL/include;../../../../oxygine-framework//oxygine/third_party/win32/pthreads/include;../../../src;../../../ae-movie/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies></AdditionalDependencies>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
       <AdditionalLibraryDirectories>../../../../oxygine-framework//oxygine/third_party/win32/libraries;../../../../oxygine-framework//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
     </Link>
@@ -103,7 +96,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../oxygine-framework//oxygine/src;../../../..//SDL/include;../../../../oxygine-framework//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../oxygine-framework//oxygine/src;../../../..//SDL/include;../../../../oxygine-framework//oxygine/third_party/win32/pthreads/include;../../../src;../../../ae-movie/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -111,20 +104,49 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../../../oxygine-framework//oxygine/third_party/win32/libraries;../../../../oxygine-framework//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies></AdditionalDependencies>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>    
+  <ItemGroup>
     <ProjectReference Include="../../../../oxygine-framework/\oxygine\SDL\win32\oxygine.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/main.cpp" />
+    <ClCompile Include="../src/example.cpp" />
+    <ClCompile Include="../src/main.cpp" />
+    <ClCompile Include="..\..\..\ae-movie\src\movie_bezier.c" />
+    <ClCompile Include="..\..\..\ae-movie\src\movie_composition.c" />
+    <ClCompile Include="..\..\..\ae-movie\src\movie_data.c" />
+    <ClCompile Include="..\..\..\ae-movie\src\movie_instance.c" />
+    <ClCompile Include="..\..\..\ae-movie\src\movie_math.c" />
+    <ClCompile Include="..\..\..\ae-movie\src\movie_providers.c" />
+    <ClCompile Include="..\..\..\ae-movie\src\movie_skeleton.c" />
+    <ClCompile Include="..\..\..\ae-movie\src\movie_stream.c" />
+    <ClCompile Include="..\..\..\ae-movie\src\movie_transformation.c" />
+    <ClCompile Include="..\..\..\src\ae\AEMovie.cpp" />
+    <ClCompile Include="..\..\..\src\ae\AEMovieResource.cpp" />
+    <ClCompile Include="..\..\..\src\ae\AERenderer.cpp" />
+    <ClCompile Include="..\src\AEMovieWork.cpp" />
+    <ClCompile Include="..\src\test.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../src/example.h" />
+    <ClInclude Include="..\..\..\ae-movie\src\movie_bezier.h" />
+    <ClInclude Include="..\..\..\ae-movie\src\movie_debug.h" />
+    <ClInclude Include="..\..\..\ae-movie\src\movie_math.h" />
+    <ClInclude Include="..\..\..\ae-movie\src\movie_memory.h" />
+    <ClInclude Include="..\..\..\ae-movie\src\movie_stream.h" />
+    <ClInclude Include="..\..\..\ae-movie\src\movie_struct.h" />
+    <ClInclude Include="..\..\..\ae-movie\src\movie_transformation.h" />
+    <ClInclude Include="..\..\..\src\ae\AEConf.h" />
+    <ClInclude Include="..\..\..\src\ae\AEMovie.h" />
+    <ClInclude Include="..\..\..\src\ae\AEMovieResource.h" />
+    <ClInclude Include="..\..\..\src\ae\AERenderer.h" />
+    <ClInclude Include="..\src\AEMovieWork.h" />
+    <ClInclude Include="..\src\test.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

+ 103 - 0
examples/HelloViewerAE/proj.win32/HelloViewerAE.vcxproj.filters

@@ -13,5 +13,108 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="dependencies">
+      <UniqueIdentifier>{68116c63-40e7-48cf-9e54-1ef4692fef7a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="dependencies\oxygine-ae">
+      <UniqueIdentifier>{e1115398-40c0-46d4-8f36-373309044864}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="dependencies\lib">
+      <UniqueIdentifier>{bd2aa26c-548f-4c17-9ebd-96a7cd837657}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="../src/example.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="../src/main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ae\AEMovie.cpp">
+      <Filter>dependencies\oxygine-ae</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ae\AEMovieResource.cpp">
+      <Filter>dependencies\oxygine-ae</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ae\AERenderer.cpp">
+      <Filter>dependencies\oxygine-ae</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\AEMovieWork.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\test.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ae-movie\src\movie_bezier.c">
+      <Filter>dependencies\lib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ae-movie\src\movie_composition.c">
+      <Filter>dependencies\lib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ae-movie\src\movie_data.c">
+      <Filter>dependencies\lib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ae-movie\src\movie_instance.c">
+      <Filter>dependencies\lib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ae-movie\src\movie_math.c">
+      <Filter>dependencies\lib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ae-movie\src\movie_providers.c">
+      <Filter>dependencies\lib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ae-movie\src\movie_skeleton.c">
+      <Filter>dependencies\lib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ae-movie\src\movie_stream.c">
+      <Filter>dependencies\lib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ae-movie\src\movie_transformation.c">
+      <Filter>dependencies\lib</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="../src/example.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\ae\AEConf.h">
+      <Filter>dependencies\oxygine-ae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\ae\AEMovie.h">
+      <Filter>dependencies\oxygine-ae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\ae\AEMovieResource.h">
+      <Filter>dependencies\oxygine-ae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\ae\AERenderer.h">
+      <Filter>dependencies\oxygine-ae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\AEMovieWork.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\test.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ae-movie\src\movie_bezier.h">
+      <Filter>dependencies\lib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ae-movie\src\movie_debug.h">
+      <Filter>dependencies\lib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ae-movie\src\movie_math.h">
+      <Filter>dependencies\lib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ae-movie\src\movie_memory.h">
+      <Filter>dependencies\lib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ae-movie\src\movie_stream.h">
+      <Filter>dependencies\lib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ae-movie\src\movie_struct.h">
+      <Filter>dependencies\lib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ae-movie\src\movie_transformation.h">
+      <Filter>dependencies\lib</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>