actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #195 from kyzentun/AMV_in_projects

Browse Source 
AMV in projects
This commit is contained in:
kyzentun
2014-06-17 00:18:07 -06:00
parent e4f1682964 955e6ddc7d
commit f7b808ca29
8 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Xcode/stepmania.xcodeproj/project.pbxproj
+8
View File
@@ -180,6 +180,8 @@
36CA531D0F91564A0063D59D /* ScreenOptionsCourseOverview.h in Headers */ = {isa = PBXBuildFile; fileRef = 36CA531B0F91564A0063D59D /* ScreenOptionsCourseOverview.h */; };
36CA53200F9156860063D59D /* ScreenOptionsEditCourse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36CA531E0F9156860063D59D /* ScreenOptionsEditCourse.cpp */; };
36CA53210F9156860063D59D /* ScreenOptionsEditCourse.h in Headers */ = {isa = PBXBuildFile; fileRef = 36CA531F0F9156860063D59D /* ScreenOptionsEditCourse.h */; };
37171EBE1946C9D500E09FC5 /* ActorMultiVertex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37171EBC1946C9D500E09FC5 /* ActorMultiVertex.cpp */; };
37171EBF1946C9D500E09FC5 /* ActorMultiVertex.h in Headers */ = {isa = PBXBuildFile; fileRef = 37171EBD1946C9D500E09FC5 /* ActorMultiVertex.h */; };
AA059ABC0B8CCFB5006F8139 /* ActorMultiTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA059ABA0B8CCFB5006F8139 /* ActorMultiTexture.cpp */; };
AA059ABD0B8CCFB5006F8139 /* ActorMultiTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA059ABB0B8CCFB5006F8139 /* ActorMultiTexture.h */; };
AA059ABE0B8CCFB5006F8139 /* ActorMultiTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA059ABA0B8CCFB5006F8139 /* ActorMultiTexture.cpp */; };
@@ -2061,6 +2063,8 @@
36CA531B0F91564A0063D59D /* ScreenOptionsCourseOverview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScreenOptionsCourseOverview.h; path = ../src/ScreenOptionsCourseOverview.h; sourceTree = SOURCE_ROOT; };
36CA531E0F9156860063D59D /* ScreenOptionsEditCourse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScreenOptionsEditCourse.cpp; path = ../src/ScreenOptionsEditCourse.cpp; sourceTree = SOURCE_ROOT; };
36CA531F0F9156860063D59D /* ScreenOptionsEditCourse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScreenOptionsEditCourse.h; path = ../src/ScreenOptionsEditCourse.h; sourceTree = SOURCE_ROOT; };
37171EBC1946C9D500E09FC5 /* ActorMultiVertex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ActorMultiVertex.cpp; path = ../src/ActorMultiVertex.cpp; sourceTree = "<group>"; };
37171EBD1946C9D500E09FC5 /* ActorMultiVertex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActorMultiVertex.h; path = ../src/ActorMultiVertex.h; sourceTree = "<group>"; };
AA059ABA0B8CCFB5006F8139 /* ActorMultiTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = ActorMultiTexture.cpp; path = ../src/ActorMultiTexture.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 1; };
AA059ABB0B8CCFB5006F8139 /* ActorMultiTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.c.h; name = ActorMultiTexture.h; path = ../src/ActorMultiTexture.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 1; };
AA059E2A0B8F0C66006F8139 /* libz_link.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libz_link.a; sourceTree = "<group>"; };
@@ -4480,6 +4484,8 @@
AA6EFF7404770F8B005F316C /* Actors */ = {
isa = PBXGroup;
children = (
37171EBC1946C9D500E09FC5 /* ActorMultiVertex.cpp */,
37171EBD1946C9D500E09FC5 /* ActorMultiVertex.h */,
AA6EFF7504770FFD005F316C /* Actor.cpp */,
AA6EFF7604770FFD005F316C /* Actor.h */,
AA6EFF7704770FFD005F316C /* ActorFrame.cpp */,
@@ -5488,6 +5494,7 @@
B773AE6E140AAB1800C68DDD /* SpecialDirs.h in Headers */,
2B01A79816C881E500D5CFD2 /* RageDisplay_OGL_Helpers.h in Headers */,
2B01A79C16C881E500D5CFD2 /* RageDisplay_OGL.h in Headers */,
37171EBF1946C9D500E09FC5 /* ActorMultiVertex.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6895,6 +6902,7 @@
B7845BC5154052CB000DFDA8 /* RageUtil.cpp in Sources */,
2B01A79616C881E500D5CFD2 /* RageDisplay_OGL_Helpers.cpp in Sources */,
2B01A79A16C881E500D5CFD2 /* RageDisplay_OGL.cpp in Sources */,
37171EBE1946C9D500E09FC5 /* ActorMultiVertex.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
src/Makefile.am
+1
View File
@@ -555,6 +555,7 @@ Actors = \
Actor.cpp Actor.h ActorFrame.cpp ActorFrame.h \
ActorFrameTexture.cpp ActorFrameTexture.h \
ActorMultiTexture.cpp ActorMultiTexture.h \
ActorMultiVertex.cpp ActorMultiVertex.h \
ActorProxy.cpp ActorProxy.h \
ActorScroller.cpp ActorScroller.h ActorUtil.cpp ActorUtil.h \
ActorSound.cpp ActorSound.h \
src/StepMania-net2010.vcxproj
+2
View File
@@ -748,6 +748,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
<ClCompile Include="ActorFrame.cpp" />
<ClCompile Include="ActorFrameTexture.cpp" />
<ClCompile Include="ActorMultiTexture.cpp" />
<ClCompile Include="ActorMultiVertex.cpp" />
<ClCompile Include="ActorProxy.cpp" />
<ClCompile Include="ActorScroller.cpp" />
<ClCompile Include="ActorSound.cpp" />
@@ -2069,6 +2070,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
<ClInclude Include="ActorFrame.h" />
<ClInclude Include="ActorFrameTexture.h" />
<ClInclude Include="ActorMultiTexture.h" />
<ClInclude Include="ActorMultiVertex.h" />
<ClInclude Include="ActorProxy.h" />
<ClInclude Include="ActorScroller.h" />
<ClInclude Include="ActorSound.h" />
src/StepMania-net2010.vcxproj.filters
+6
View File
@@ -1251,6 +1251,9 @@
<ClCompile Include="ActorMultiTexture.cpp">
<Filter>Actors</Filter>
</ClCompile>
<ClCompile Include="ActorMultiVertex.cpp">
<Filter>Actors</Filter>
</ClCompile>
<ClCompile Include="ActorProxy.cpp">
<Filter>Actors</Filter>
</ClCompile>
@@ -2783,6 +2786,9 @@
<ClInclude Include="ActorMultiTexture.h">
<Filter>Actors</Filter>
</ClInclude>
<ClInclude Include="ActorMultiVertex.h">
<Filter>Actors</Filter>
</ClInclude>
<ClInclude Include="ActorProxy.h">
<Filter>Actors</Filter>
</ClInclude>
src/StepMania-net2011.vcxproj
+3 -1
View File
@@ -774,6 +774,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
<ClCompile Include="ActorFrame.cpp" />
<ClCompile Include="ActorFrameTexture.cpp" />
<ClCompile Include="ActorMultiTexture.cpp" />
<ClCompile Include="ActorMultiVertex.cpp" />
<ClCompile Include="ActorProxy.cpp" />
<ClCompile Include="ActorScroller.cpp" />
<ClCompile Include="ActorSound.cpp" />
@@ -1655,6 +1656,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
<ClInclude Include="ActorFrame.h" />
<ClInclude Include="ActorFrameTexture.h" />
<ClInclude Include="ActorMultiTexture.h" />
<ClInclude Include="ActorMultiVertex.h" />
<ClInclude Include="ActorProxy.h" />
<ClInclude Include="ActorScroller.h" />
<ClInclude Include="ActorSound.h" />
@@ -1935,4 +1937,4 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
src/StepMania-net2011.vcxproj.filters
+7 -1
View File
@@ -1239,6 +1239,9 @@
<ClCompile Include="ActorMultiTexture.cpp">
<Filter>Actors</Filter>
</ClCompile>
<ClCompile Include="ActorMultiVertex.cpp">
<Filter>Actors</Filter>
</ClCompile>
<ClCompile Include="ActorProxy.cpp">
<Filter>Actors</Filter>
</ClCompile>
@@ -2621,6 +2624,9 @@
<ClInclude Include="ActorMultiTexture.h">
<Filter>Actors</Filter>
</ClInclude>
<ClInclude Include="ActorMultiVertex.h">
<Filter>Actors</Filter>
</ClInclude>
<ClInclude Include="ActorProxy.h">
<Filter>Actors</Filter>
</ClInclude>
@@ -2869,4 +2875,4 @@
<Filter>BaseClasses</Filter>
</CustomBuildStep>
</ItemGroup>
</Project>
</Project>
src/StepMania-net2013.vcxproj
+3 -1
View File
@@ -773,6 +773,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
<ClCompile Include="ActorFrame.cpp" />
<ClCompile Include="ActorFrameTexture.cpp" />
<ClCompile Include="ActorMultiTexture.cpp" />
<ClCompile Include="ActorMultiVertex.cpp" />
<ClCompile Include="ActorProxy.cpp" />
<ClCompile Include="ActorScroller.cpp" />
<ClCompile Include="ActorSound.cpp" />
@@ -2094,6 +2095,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
<ClInclude Include="ActorFrame.h" />
<ClInclude Include="ActorFrameTexture.h" />
<ClInclude Include="ActorMultiTexture.h" />
<ClInclude Include="ActorMultiVertex.h" />
<ClInclude Include="ActorProxy.h" />
<ClInclude Include="ActorScroller.h" />
<ClInclude Include="ActorSound.h" />
@@ -2395,4 +2397,4 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
src/StepMania-net2013.vcxproj.filters
+6
View File
@@ -1251,6 +1251,9 @@
<ClCompile Include="ActorMultiTexture.cpp">
<Filter>Actors</Filter>
</ClCompile>
<ClCompile Include="ActorMultiVertex.cpp">
<Filter>Actors</Filter>
</ClCompile>
<ClCompile Include="ActorProxy.cpp">
<Filter>Actors</Filter>
</ClCompile>
@@ -2783,6 +2786,9 @@
<ClInclude Include="ActorMultiTexture.h">
<Filter>Actors</Filter>
</ClInclude>
<ClInclude Include="ActorMultiVertex.h">
<Filter>Actors</Filter>
</ClInclude>
<ClInclude Include="ActorProxy.h">
<Filter>Actors</Filter>
</ClInclude>