Changeset 1847
- Timestamp:
- Aug 31, 2012, 1:54:23 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/.gitignore
r1841 r1847 64 64 test/benchsuite 65 65 test/btphystest 66 test/quad67 66 test/testsuite 68 67 test/sandbox/sample -
trunk/build/vs2010/Lol.sln
r1824 r1847 24 24 EndProject 25 25 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}" 26 EndProject27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quad", "..\..\test\debug\quad.vcxproj", "{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}"28 ProjectSection(ProjectDependencies) = postProject29 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}30 EndProjectSection31 26 EndProject 32 27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "..\..\test\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}" … … 184 179 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.Build.0 = Release|Xbox 360 185 180 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 186 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|PS3.ActiveCfg = Debug|PS3187 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|PS3.Build.0 = Debug|PS3188 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Win32.ActiveCfg = Debug|Win32189 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Win32.Build.0 = Debug|Win32190 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|x64.ActiveCfg = Debug|x64191 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|x64.Build.0 = Debug|x64192 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360193 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.Build.0 = Debug|Xbox 360194 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360195 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|PS3.ActiveCfg = Release|PS3196 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|PS3.Build.0 = Release|PS3197 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Win32.ActiveCfg = Release|Win32198 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Win32.Build.0 = Release|Win32199 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|x64.ActiveCfg = Release|x64200 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|x64.Build.0 = Release|x64201 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.ActiveCfg = Release|Xbox 360202 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.Build.0 = Release|Xbox 360203 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.Deploy.0 = Release|Xbox 360204 181 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|PS3.ActiveCfg = Debug|PS3 205 182 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|PS3.Build.0 = Debug|PS3 … … 483 460 {17F0F184-4436-4D08-B8AA-16572EA238DB} = {2F87CEAB-4818-443C-A5E3-6C34E7D967EC} 484 461 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E} 485 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E} = {E0491194-35E3-4513-9D31-608EA3165ECF}486 462 {B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {E0491194-35E3-4513-9D31-608EA3165ECF} 487 463 {80F81C11-8DA2-4990-91CB-9807783BA46E} = {E0491194-35E3-4513-9D31-608EA3165ECF} -
trunk/src/Makefile.am
r1846 r1847 66 66 loldebug.h \ 67 67 debug/fps.cpp debug/fps.h debug/sphere.cpp debug/sphere.h \ 68 debug/record.cpp debug/record.h debug/stats.cpp debug/stats.h \ 69 debug/quad.cpp debug/quad.h 68 debug/record.cpp debug/record.h debug/stats.cpp debug/stats.h 70 69 liblol_a_CPPFLAGS = @LOL_CFLAGS@ -Ibullet 71 70 -
trunk/src/lolcore.vcxproj
r1846 r1847 236 236 <ClCompile Include="camera.cpp" /> 237 237 <ClCompile Include="debug\fps.cpp" /> 238 <ClCompile Include="debug\quad.cpp" />239 238 <ClCompile Include="debug\record.cpp" /> 240 239 <ClCompile Include="debug\sphere.cpp" /> … … 549 548 <ClInclude Include="core.h" /> 550 549 <ClInclude Include="debug\fps.h" /> 551 <ClInclude Include="debug\quad.h" />552 550 <ClInclude Include="debug\record.h" /> 553 551 <ClInclude Include="debug\sphere.h" /> -
trunk/src/lolcore.vcxproj.filters
r1610 r1847 71 71 <Filter>src\debug</Filter> 72 72 </ClCompile> 73 <ClCompile Include="debug\quad.cpp">74 <Filter>src\debug</Filter>75 </ClCompile>76 73 <ClCompile Include="debug\record.cpp"> 77 74 <Filter>src\debug</Filter> … … 638 635 </ClInclude> 639 636 <ClInclude Include="debug\fps.h"> 640 <Filter>src\debug</Filter>641 </ClInclude>642 <ClInclude Include="debug\quad.h">643 637 <Filter>src\debug</Filter> 644 638 </ClInclude> -
trunk/src/loldebug.h
r783 r1847 18 18 19 19 #include "debug/fps.h" 20 #include "debug/quad.h"21 20 #include "debug/record.h" 22 21 #include "debug/sphere.h" -
trunk/test/Makefile.am
r1797 r1847 18 18 EXTRA_DIST = data/gradient.png 19 19 20 noinst_PROGRAMS = quadbenchsuite $(testsuite) btphystest20 noinst_PROGRAMS = benchsuite $(testsuite) btphystest 21 21 22 22 TESTS = $(testsuite) … … 42 42 benchsuite_DEPENDENCIES = $(top_builddir)/src/liblol.a 43 43 44 quad_SOURCES = debug/quad.cpp45 quad_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@46 quad_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@47 quad_DEPENDENCIES = $(top_builddir)/src/liblol.a48 49 44 btphystest_SOURCES = BtPhysTest.cpp BtPhysTest.h \ 50 45 Physics/Src/EasyPhysics.cpp Physics/Include/EasyPhysics.h \
Note: See TracChangeset
for help on using the changeset viewer.