Changeset 1518


Ignore:
Timestamp:
Jun 24, 2012, 1:19:11 PM (7 years ago)
Author:
sam
Message:

build: reorganise all the build stuff so that it lies in build/ and
make sure each .vcxproj file is with its corresponding source code.

Location:
trunk
Files:
3 added
2 deleted
4 edited
1 copied
27 moved

Legend:

Unmodified
Added
Removed
  • trunk/.gitignore

    r1479 r1518  
    4343# Visual Studio cruft
    4444*.vcxproj.user
    45 win32/ipch
    46 win32/*Debug
    47 win32/*Release
    48 win32/*.opensdf
    49 win32/*.sdf
    50 win32/*.suo
    51 win32/*.log
    52 win32/*.XGD
     45build/vs2010/ipch
     46build/vs2010/*Debug
     47build/vs2010/*Release
     48build/vs2010/*.opensdf
     49build/vs2010/*.sdf
     50build/vs2010/*.suo
     51build/vs2010/*.log
     52build/vs2010/*.XGD
    5353# Do not exclude anything in contrib; this is currently one level
    5454# more than our current max
     
    6262# Our binaries
    6363test/testsuite
    64 test/tutorial/01_triangle
    65 test/tutorial/02_cube
    66 test/tutorial/03_fractal
    6764test/benchsuite
    6865test/quad
     
    7370test/xolotl/xolotl
    7471tools/make-font
     72tutorial/01_triangle
     73tutorial/02_cube
     74tutorial/11_fractal
    7575# Our data
  • trunk/Makefile.am

    r1510 r1518  
    11
    2 SUBDIRS = src test tools gfx
     2SUBDIRS = src tutorial test tools gfx
    33SUBDIRS += deushax
    44SUBDIRS += monsterz
  • trunk/build/vs2010/Lol.Fx.xml

    • Property svn:mime-type set to text/xml
  • trunk/build/vs2010/Lol.sln

    r1517 r1518  
    22Microsoft Visual Studio Solution File, Format Version 11.00
    33# Visual Studio 2010
    4 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}"
    5         ProjectSection(ProjectDependencies) = postProject
    6                 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    7         EndProjectSection
    8 EndProject
    9 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "..\monsterz\monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}"
    10         ProjectSection(ProjectDependencies) = postProject
    11                 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    12         EndProjectSection
    13 EndProject
    14 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "..\deushax\editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}"
     4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\..\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}"
     5        ProjectSection(ProjectDependencies) = postProject
     6                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     7        EndProjectSection
     8EndProject
     9Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "..\..\monsterz\monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}"
     10        ProjectSection(ProjectDependencies) = postProject
     11                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     12        EndProjectSection
     13EndProject
     14Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "..\..\deushax\editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}"
    1515        ProjectSection(ProjectDependencies) = postProject
    1616                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     
    2121Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Monsterz", "Monsterz", "{2F87CEAB-4818-443C-A5E3-6C34E7D967EC}"
    2222EndProject
    23 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolcore", "lolcore.vcxproj", "{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}"
     23Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolcore", "..\..\src\lolcore.vcxproj", "{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}"
    2424EndProject
    2525Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}"
    2626EndProject
    27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quad", "quad.vcxproj", "{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}"
    28         ProjectSection(ProjectDependencies) = postProject
    29                 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    30         EndProjectSection
    31 EndProject
    32 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}"
    33         ProjectSection(ProjectDependencies) = postProject
    34                 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    35         EndProjectSection
    36 EndProject
    37 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "testsuite.vcxproj", "{80F81C11-8DA2-4990-91CB-9807783BA46E}"
     27Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quad", "..\..\test\debug\quad.vcxproj", "{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}"
     28        ProjectSection(ProjectDependencies) = postProject
     29                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     30        EndProjectSection
     31EndProject
     32Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "..\..\test\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}"
     33        ProjectSection(ProjectDependencies) = postProject
     34                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     35        EndProjectSection
     36EndProject
     37Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "..\..\test\testsuite.vcxproj", "{80F81C11-8DA2-4990-91CB-9807783BA46E}"
    3838        ProjectSection(ProjectDependencies) = postProject
    3939                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     
    4242Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorial", "Tutorial", "{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}"
    4343EndProject
    44 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}"
    45         ProjectSection(ProjectDependencies) = postProject
    46                 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    47         EndProjectSection
    48 EndProject
    49 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}"
    50         ProjectSection(ProjectDependencies) = postProject
    51                 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    52         EndProjectSection
    53 EndProject
    54 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03_fractal", "03_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}"
     44Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "..\..\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}"
     45        ProjectSection(ProjectDependencies) = postProject
     46                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     47        EndProjectSection
     48EndProject
     49Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "..\..\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}"
     50        ProjectSection(ProjectDependencies) = postProject
     51                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     52        EndProjectSection
     53EndProject
     54Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "11_fractal", "..\..\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}"
    5555        ProjectSection(ProjectDependencies) = postProject
    5656                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     
    5959Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MrPigeon", "MrPigeon", "{33704AA4-F2B5-4138-A40D-E3E77F89ED46}"
    6060EndProject
    61 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "..\mrpigeon\mrpigeon.vcxproj", "{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}"
     61Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "..\..\mrpigeon\mrpigeon.vcxproj", "{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}"
    6262        ProjectSection(ProjectDependencies) = postProject
    6363                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     
    6868Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orbital", "Orbital", "{8C77EAA8-1077-4EF7-AE53-97C6C60A3601}"
    6969EndProject
    70 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "..\orbital\orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}"
     70Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "..\..\orbital\orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}"
    7171EndProject
    7272Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD580B-98B8-4689-B661-38C41132C60E}"
     
    7979Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Neercs", "Neercs", "{B357514A-7881-422D-8358-161B689E7620}"
    8080EndProject
    81 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neercs", "..\neercs\neercs.vcxproj", "{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}"
     81Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neercs", "..\..\neercs\neercs.vcxproj", "{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}"
    8282EndProject
    8383Global
  • trunk/configure.ac

    r1505 r1518  
    378378 [Makefile
    379379  src/Makefile
     380  tutorial/Makefile
    380381  test/Makefile
    381382  test/math/Makefile
    382383  test/sandbox/Makefile
    383   test/tutorial/Makefile
    384384  test/xolotl/Makefile
    385385  gfx/Makefile
  • trunk/src/lolcore.vcxproj.filters

    r1517 r1518  
    5959  </ItemGroup>
    6060  <ItemGroup>
    61     <ClCompile Include="..\src\image\image.cpp">
     61    <ClCompile Include="image\image.cpp">
    6262      <Filter>src\image</Filter>
    6363    </ClCompile>
    64     <ClCompile Include="..\src\debug\fps.cpp">
    65       <Filter>src\debug</Filter>
    66     </ClCompile>
    67     <ClCompile Include="..\src\debug\quad.cpp">
    68       <Filter>src\debug</Filter>
    69     </ClCompile>
    70     <ClCompile Include="..\src\debug\record.cpp">
    71       <Filter>src\debug</Filter>
    72     </ClCompile>
    73     <ClCompile Include="..\src\debug\sphere.cpp">
    74       <Filter>src\debug</Filter>
    75     </ClCompile>
    76     <ClCompile Include="..\src\debug\stats.cpp">
    77       <Filter>src\debug</Filter>
    78     </ClCompile>
    79     <ClCompile Include="..\src\platform\sdl\sdlapp.cpp">
     64    <ClCompile Include="debug\fps.cpp">
     65      <Filter>src\debug</Filter>
     66    </ClCompile>
     67    <ClCompile Include="debug\quad.cpp">
     68      <Filter>src\debug</Filter>
     69    </ClCompile>
     70    <ClCompile Include="debug\record.cpp">
     71      <Filter>src\debug</Filter>
     72    </ClCompile>
     73    <ClCompile Include="debug\sphere.cpp">
     74      <Filter>src\debug</Filter>
     75    </ClCompile>
     76    <ClCompile Include="debug\stats.cpp">
     77      <Filter>src\debug</Filter>
     78    </ClCompile>
     79    <ClCompile Include="platform\sdl\sdlapp.cpp">
    8080      <Filter>src\platform\sdl</Filter>
    8181    </ClCompile>
    82     <ClCompile Include="..\src\platform\sdl\sdlinput.cpp">
     82    <ClCompile Include="platform\sdl\sdlinput.cpp">
    8383      <Filter>src\platform\sdl</Filter>
    8484    </ClCompile>
    85     <ClCompile Include="..\src\math\half.cpp">
     85    <ClCompile Include="math\half.cpp">
    8686      <Filter>src\math</Filter>
    8787    </ClCompile>
    88     <ClCompile Include="..\src\math\real.cpp">
     88    <ClCompile Include="math\real.cpp">
    8989      <Filter>src\math</Filter>
    9090    </ClCompile>
    91     <ClCompile Include="..\src\math\trig.cpp">
     91    <ClCompile Include="math\trig.cpp">
    9292      <Filter>src\math</Filter>
    9393    </ClCompile>
    94     <ClCompile Include="..\src\math\vector.cpp">
     94    <ClCompile Include="math\vector.cpp">
    9595      <Filter>src\math</Filter>
    9696    </ClCompile>
    97     <ClCompile Include="..\src\gpu\shader.cpp">
    98       <Filter>src\gpu</Filter>
    99     </ClCompile>
    100     <ClCompile Include="..\src\gpu\vertexbuffer.cpp">
    101       <Filter>src\gpu</Filter>
    102     </ClCompile>
    103     <ClCompile Include="..\src\application\application.cpp">
     97    <ClCompile Include="gpu\shader.cpp">
     98      <Filter>src\gpu</Filter>
     99    </ClCompile>
     100    <ClCompile Include="gpu\vertexbuffer.cpp">
     101      <Filter>src\gpu</Filter>
     102    </ClCompile>
     103    <ClCompile Include="application\application.cpp">
    104104      <Filter>src\application</Filter>
    105105    </ClCompile>
    106     <ClCompile Include="..\src\image\codec\android-image.cpp">
    107       <Filter>src\image\codec</Filter>
    108     </ClCompile>
    109     <ClCompile Include="..\src\image\codec\dummy-image.cpp">
    110       <Filter>src\image\codec</Filter>
    111     </ClCompile>
    112     <ClCompile Include="..\src\image\codec\gdiplus-image.cpp">
    113       <Filter>src\image\codec</Filter>
    114     </ClCompile>
    115     <ClCompile Include="..\src\image\codec\ios-image.cpp">
    116       <Filter>src\image\codec</Filter>
    117     </ClCompile>
    118     <ClCompile Include="..\src\image\codec\ps3-image.cpp">
    119       <Filter>src\image\codec</Filter>
    120     </ClCompile>
    121     <ClCompile Include="..\src\image\codec\sdl-image.cpp">
    122       <Filter>src\image\codec</Filter>
    123     </ClCompile>
    124     <ClCompile Include="..\src\platform\xbox\xboxapp.cpp">
     106    <ClCompile Include="image\codec\android-image.cpp">
     107      <Filter>src\image\codec</Filter>
     108    </ClCompile>
     109    <ClCompile Include="image\codec\dummy-image.cpp">
     110      <Filter>src\image\codec</Filter>
     111    </ClCompile>
     112    <ClCompile Include="image\codec\gdiplus-image.cpp">
     113      <Filter>src\image\codec</Filter>
     114    </ClCompile>
     115    <ClCompile Include="image\codec\ios-image.cpp">
     116      <Filter>src\image\codec</Filter>
     117    </ClCompile>
     118    <ClCompile Include="image\codec\ps3-image.cpp">
     119      <Filter>src\image\codec</Filter>
     120    </ClCompile>
     121    <ClCompile Include="image\codec\sdl-image.cpp">
     122      <Filter>src\image\codec</Filter>
     123    </ClCompile>
     124    <ClCompile Include="platform\xbox\xboxapp.cpp">
    125125      <Filter>src\platform\xbox</Filter>
    126126    </ClCompile>
    127     <ClCompile Include="..\src\platform\xbox\xboxinput.cpp">
     127    <ClCompile Include="platform\xbox\xboxinput.cpp">
    128128      <Filter>src\platform\xbox</Filter>
    129129    </ClCompile>
    130     <ClCompile Include="..\src\gpu\indexbuffer.cpp">
    131       <Filter>src\gpu</Filter>
    132     </ClCompile>
    133     <ClCompile Include="..\src\input\input.cpp">
     130    <ClCompile Include="gpu\indexbuffer.cpp">
     131      <Filter>src\gpu</Filter>
     132    </ClCompile>
     133    <ClCompile Include="input\input.cpp">
    134134      <Filter>src\input</Filter>
    135135    </ClCompile>
    136     <ClCompile Include="..\src\input\stick.cpp">
     136    <ClCompile Include="input\stick.cpp">
    137137      <Filter>src\input</Filter>
    138138    </ClCompile>
    139     <ClCompile Include="..\src\platform\d3d9\d3d9input.cpp">
     139    <ClCompile Include="platform\d3d9\d3d9input.cpp">
    140140      <Filter>src\platform\d3d9</Filter>
    141141    </ClCompile>
    142     <ClCompile Include="..\src\audio.cpp">
    143       <Filter>src\...</Filter>
    144     </ClCompile>
    145     <ClCompile Include="..\src\camera.cpp">
    146       <Filter>src\...</Filter>
    147     </ClCompile>
    148     <ClCompile Include="..\src\dict.cpp">
    149       <Filter>src\...</Filter>
    150     </ClCompile>
    151     <ClCompile Include="..\src\eglapp.cpp">
    152       <Filter>src\...</Filter>
    153     </ClCompile>
    154     <ClCompile Include="..\src\emitter.cpp">
    155       <Filter>src\...</Filter>
    156     </ClCompile>
    157     <ClCompile Include="..\src\entity.cpp">
    158       <Filter>src\...</Filter>
    159     </ClCompile>
    160     <ClCompile Include="..\src\font.cpp">
    161       <Filter>src\...</Filter>
    162     </ClCompile>
    163     <ClCompile Include="..\src\forge.cpp">
    164       <Filter>src\...</Filter>
    165     </ClCompile>
    166     <ClCompile Include="..\src\gradient.cpp">
    167       <Filter>src\...</Filter>
    168     </ClCompile>
    169     <ClCompile Include="..\src\hash.cpp">
    170       <Filter>src\...</Filter>
    171     </ClCompile>
    172     <ClCompile Include="..\src\layer.cpp">
    173       <Filter>src\...</Filter>
    174     </ClCompile>
    175     <ClCompile Include="..\src\ticker.cpp">
    176       <Filter>src\...</Filter>
    177     </ClCompile>
    178     <ClCompile Include="..\src\log.cpp">
    179       <Filter>src\...</Filter>
    180     </ClCompile>
    181     <ClCompile Include="..\src\map.cpp">
    182       <Filter>src\...</Filter>
    183     </ClCompile>
    184     <ClCompile Include="..\src\platform.cpp">
    185       <Filter>src\...</Filter>
    186     </ClCompile>
    187     <ClCompile Include="..\src\profiler.cpp">
    188       <Filter>src\...</Filter>
    189     </ClCompile>
    190     <ClCompile Include="..\src\sample.cpp">
    191       <Filter>src\...</Filter>
    192     </ClCompile>
    193     <ClCompile Include="..\src\sampler.cpp">
    194       <Filter>src\...</Filter>
    195     </ClCompile>
    196     <ClCompile Include="..\src\scene.cpp">
    197       <Filter>src\...</Filter>
    198     </ClCompile>
    199     <ClCompile Include="..\src\sprite.cpp">
    200       <Filter>src\...</Filter>
    201     </ClCompile>
    202     <ClCompile Include="..\src\text.cpp">
    203       <Filter>src\...</Filter>
    204     </ClCompile>
    205     <ClCompile Include="..\src\tiler.cpp">
    206       <Filter>src\...</Filter>
    207     </ClCompile>
    208     <ClCompile Include="..\src\tileset.cpp">
    209       <Filter>src\...</Filter>
    210     </ClCompile>
    211     <ClCompile Include="..\src\timer.cpp">
    212       <Filter>src\...</Filter>
    213     </ClCompile>
    214     <ClCompile Include="..\src\video.cpp">
    215       <Filter>src\...</Filter>
    216     </ClCompile>
    217     <ClCompile Include="..\src\world.cpp">
    218       <Filter>src\...</Filter>
    219     </ClCompile>
    220     <ClCompile Include="..\src\worldentity.cpp">
    221       <Filter>src\...</Filter>
    222     </ClCompile>
    223     <ClCompile Include="..\src\gpu\framebuffer.cpp">
    224       <Filter>src\gpu</Filter>
    225     </ClCompile>
    226     <ClCompile Include="..\src\easymesh\easymesh.cpp">
    227       <Filter>src\easymesh</Filter>
    228     </ClCompile>
    229     <ClCompile Include="..\src\easymesh\easymesh-compiler.cpp">
    230       <Filter>src\easymesh</Filter>
    231     </ClCompile>
    232     <ClCompile Include="..\src\generated\easymesh-parser.cpp">
    233       <Filter>src\generated</Filter>
    234     </ClCompile>
    235     <ClCompile Include="..\src\generated\easymesh-scanner.cpp">
     142    <ClCompile Include="audio.cpp">
     143      <Filter>src\...</Filter>
     144    </ClCompile>
     145    <ClCompile Include="camera.cpp">
     146      <Filter>src\...</Filter>
     147    </ClCompile>
     148    <ClCompile Include="dict.cpp">
     149      <Filter>src\...</Filter>
     150    </ClCompile>
     151    <ClCompile Include="eglapp.cpp">
     152      <Filter>src\...</Filter>
     153    </ClCompile>
     154    <ClCompile Include="emitter.cpp">
     155      <Filter>src\...</Filter>
     156    </ClCompile>
     157    <ClCompile Include="entity.cpp">
     158      <Filter>src\...</Filter>
     159    </ClCompile>
     160    <ClCompile Include="font.cpp">
     161      <Filter>src\...</Filter>
     162    </ClCompile>
     163    <ClCompile Include="forge.cpp">
     164      <Filter>src\...</Filter>
     165    </ClCompile>
     166    <ClCompile Include="gradient.cpp">
     167      <Filter>src\...</Filter>
     168    </ClCompile>
     169    <ClCompile Include="hash.cpp">
     170      <Filter>src\...</Filter>
     171    </ClCompile>
     172    <ClCompile Include="layer.cpp">
     173      <Filter>src\...</Filter>
     174    </ClCompile>
     175    <ClCompile Include="ticker.cpp">
     176      <Filter>src\...</Filter>
     177    </ClCompile>
     178    <ClCompile Include="log.cpp">
     179      <Filter>src\...</Filter>
     180    </ClCompile>
     181    <ClCompile Include="map.cpp">
     182      <Filter>src\...</Filter>
     183    </ClCompile>
     184    <ClCompile Include="platform.cpp">
     185      <Filter>src\...</Filter>
     186    </ClCompile>
     187    <ClCompile Include="profiler.cpp">
     188      <Filter>src\...</Filter>
     189    </ClCompile>
     190    <ClCompile Include="sample.cpp">
     191      <Filter>src\...</Filter>
     192    </ClCompile>
     193    <ClCompile Include="sampler.cpp">
     194      <Filter>src\...</Filter>
     195    </ClCompile>
     196    <ClCompile Include="scene.cpp">
     197      <Filter>src\...</Filter>
     198    </ClCompile>
     199    <ClCompile Include="sprite.cpp">
     200      <Filter>src\...</Filter>
     201    </ClCompile>
     202    <ClCompile Include="text.cpp">
     203      <Filter>src\...</Filter>
     204    </ClCompile>
     205    <ClCompile Include="tiler.cpp">
     206      <Filter>src\...</Filter>
     207    </ClCompile>
     208    <ClCompile Include="tileset.cpp">
     209      <Filter>src\...</Filter>
     210    </ClCompile>
     211    <ClCompile Include="timer.cpp">
     212      <Filter>src\...</Filter>
     213    </ClCompile>
     214    <ClCompile Include="video.cpp">
     215      <Filter>src\...</Filter>
     216    </ClCompile>
     217    <ClCompile Include="world.cpp">
     218      <Filter>src\...</Filter>
     219    </ClCompile>
     220    <ClCompile Include="worldentity.cpp">
     221      <Filter>src\...</Filter>
     222    </ClCompile>
     223    <ClCompile Include="gpu\framebuffer.cpp">
     224      <Filter>src\gpu</Filter>
     225    </ClCompile>
     226    <ClCompile Include="easymesh\easymesh.cpp">
     227      <Filter>src\easymesh</Filter>
     228    </ClCompile>
     229    <ClCompile Include="easymesh\easymesh-compiler.cpp">
     230      <Filter>src\easymesh</Filter>
     231    </ClCompile>
     232    <ClCompile Include="generated\easymesh-parser.cpp">
     233      <Filter>src\generated</Filter>
     234    </ClCompile>
     235    <ClCompile Include="generated\easymesh-scanner.cpp">
    236236      <Filter>src\generated</Filter>
    237237    </ClCompile>
    238238  </ItemGroup>
    239239  <ItemGroup>
    240     <ClInclude Include="..\src\image\image.h">
     240    <ClInclude Include="image\image.h">
    241241      <Filter>src\image</Filter>
    242242    </ClInclude>
    243     <ClInclude Include="..\src\debug\fps.h">
    244       <Filter>src\debug</Filter>
    245     </ClInclude>
    246     <ClInclude Include="..\src\debug\quad.h">
    247       <Filter>src\debug</Filter>
    248     </ClInclude>
    249     <ClInclude Include="..\src\debug\record.h">
    250       <Filter>src\debug</Filter>
    251     </ClInclude>
    252     <ClInclude Include="..\src\debug\sphere.h">
    253       <Filter>src\debug</Filter>
    254     </ClInclude>
    255     <ClInclude Include="..\src\debug\stats.h">
    256       <Filter>src\debug</Filter>
    257     </ClInclude>
    258     <ClInclude Include="..\src\platform\sdl\sdlinput.h">
     243    <ClInclude Include="debug\fps.h">
     244      <Filter>src\debug</Filter>
     245    </ClInclude>
     246    <ClInclude Include="debug\quad.h">
     247      <Filter>src\debug</Filter>
     248    </ClInclude>
     249    <ClInclude Include="debug\record.h">
     250      <Filter>src\debug</Filter>
     251    </ClInclude>
     252    <ClInclude Include="debug\sphere.h">
     253      <Filter>src\debug</Filter>
     254    </ClInclude>
     255    <ClInclude Include="debug\stats.h">
     256      <Filter>src\debug</Filter>
     257    </ClInclude>
     258    <ClInclude Include="platform\sdl\sdlinput.h">
    259259      <Filter>src\platform\sdl</Filter>
    260260    </ClInclude>
    261     <ClInclude Include="..\src\platform\sdl\sdlapp.h">
     261    <ClInclude Include="platform\sdl\sdlapp.h">
    262262      <Filter>src\platform\sdl</Filter>
    263263    </ClInclude>
    264     <ClInclude Include="..\src\lol\math\half.h">
     264    <ClInclude Include="lol\math\half.h">
    265265      <Filter>src\lol\math</Filter>
    266266    </ClInclude>
    267     <ClInclude Include="..\src\lol\math\math.h">
     267    <ClInclude Include="lol\math\math.h">
    268268      <Filter>src\lol\math</Filter>
    269269    </ClInclude>
    270     <ClInclude Include="..\src\lol\math\real.h">
     270    <ClInclude Include="lol\math\real.h">
    271271      <Filter>src\lol\math</Filter>
    272272    </ClInclude>
    273     <ClInclude Include="..\src\lol\math\remez.h">
     273    <ClInclude Include="lol\math\remez.h">
    274274      <Filter>src\lol\math</Filter>
    275275    </ClInclude>
    276     <ClInclude Include="..\src\lol\math\vector.h">
     276    <ClInclude Include="lol\math\vector.h">
    277277      <Filter>src\lol\math</Filter>
    278278    </ClInclude>
    279     <ClInclude Include="..\src\lol\unit.h">
     279    <ClInclude Include="lol\unit.h">
    280280      <Filter>src\lol</Filter>
    281281    </ClInclude>
    282     <ClInclude Include="..\src\gpu\shader.h">
    283       <Filter>src\gpu</Filter>
    284     </ClInclude>
    285     <ClInclude Include="..\src\gpu\vertexbuffer.h">
    286       <Filter>src\gpu</Filter>
    287     </ClInclude>
    288     <ClInclude Include="..\src\thread\thread.h">
     282    <ClInclude Include="gpu\shader.h">
     283      <Filter>src\gpu</Filter>
     284    </ClInclude>
     285    <ClInclude Include="gpu\vertexbuffer.h">
     286      <Filter>src\gpu</Filter>
     287    </ClInclude>
     288    <ClInclude Include="thread\thread.h">
    289289      <Filter>src\thread</Filter>
    290290    </ClInclude>
    291     <ClInclude Include="..\src\thread\threadbase.h">
     291    <ClInclude Include="thread\threadbase.h">
    292292      <Filter>src\thread</Filter>
    293293    </ClInclude>
    294     <ClInclude Include="..\src\application\application.h">
     294    <ClInclude Include="application\application.h">
    295295      <Filter>src\application</Filter>
    296296    </ClInclude>
    297     <ClInclude Include="..\src\image\image-private.h">
     297    <ClInclude Include="image\image-private.h">
    298298      <Filter>src\image</Filter>
    299299    </ClInclude>
    300     <ClInclude Include="..\src\platform\xbox\xboxapp.h">
     300    <ClInclude Include="platform\xbox\xboxapp.h">
    301301      <Filter>src\platform\xbox</Filter>
    302302    </ClInclude>
    303     <ClInclude Include="..\src\platform\xbox\xboxinput.h">
     303    <ClInclude Include="platform\xbox\xboxinput.h">
    304304      <Filter>src\platform\xbox</Filter>
    305305    </ClInclude>
    306     <ClInclude Include="..\src\gpu\indexbuffer.h">
    307       <Filter>src\gpu</Filter>
    308     </ClInclude>
    309     <ClInclude Include="..\src\lol\debug.h">
     306    <ClInclude Include="gpu\indexbuffer.h">
     307      <Filter>src\gpu</Filter>
     308    </ClInclude>
     309    <ClInclude Include="lol\debug.h">
    310310      <Filter>src\lol</Filter>
    311311    </ClInclude>
    312     <ClInclude Include="..\src\input\input.h">
     312    <ClInclude Include="input\input.h">
    313313      <Filter>src\input</Filter>
    314314    </ClInclude>
    315     <ClInclude Include="..\src\input\stick.h">
     315    <ClInclude Include="input\stick.h">
    316316      <Filter>src\input</Filter>
    317317    </ClInclude>
    318     <ClInclude Include="..\src\platform\d3d9\d3d9input.h">
     318    <ClInclude Include="platform\d3d9\d3d9input.h">
    319319      <Filter>src\platform\d3d9</Filter>
    320320    </ClInclude>
    321     <ClInclude Include="..\src\array.h">
    322       <Filter>src\...</Filter>
    323     </ClInclude>
    324     <ClInclude Include="..\src\hash.h">
    325       <Filter>src\...</Filter>
    326     </ClInclude>
    327     <ClInclude Include="..\src\audio.h">
    328       <Filter>src\...</Filter>
    329     </ClInclude>
    330     <ClInclude Include="..\src\bitfield.h">
    331       <Filter>src\...</Filter>
    332     </ClInclude>
    333     <ClInclude Include="..\src\camera.h">
    334       <Filter>src\...</Filter>
    335     </ClInclude>
    336     <ClInclude Include="..\src\core.h">
    337       <Filter>src\...</Filter>
    338     </ClInclude>
    339     <ClInclude Include="..\src\dict.h">
    340       <Filter>src\...</Filter>
    341     </ClInclude>
    342     <ClInclude Include="..\src\eglapp.h">
    343       <Filter>src\...</Filter>
    344     </ClInclude>
    345     <ClInclude Include="..\src\emitter.h">
    346       <Filter>src\...</Filter>
    347     </ClInclude>
    348     <ClInclude Include="..\src\entity.h">
    349       <Filter>src\...</Filter>
    350     </ClInclude>
    351     <ClInclude Include="..\src\font.h">
    352       <Filter>src\...</Filter>
    353     </ClInclude>
    354     <ClInclude Include="..\src\forge.h">
    355       <Filter>src\...</Filter>
    356     </ClInclude>
    357     <ClInclude Include="..\src\gradient.h">
    358       <Filter>src\...</Filter>
    359     </ClInclude>
    360     <ClInclude Include="..\src\layer.h">
    361       <Filter>src\...</Filter>
    362     </ClInclude>
    363     <ClInclude Include="..\src\log.h">
    364       <Filter>src\...</Filter>
    365     </ClInclude>
    366     <ClInclude Include="..\src\loldebug.h">
    367       <Filter>src\...</Filter>
    368     </ClInclude>
    369     <ClInclude Include="..\src\lolgl.h">
    370       <Filter>src\...</Filter>
    371     </ClInclude>
    372     <ClInclude Include="..\src\map.h">
    373       <Filter>src\...</Filter>
    374     </ClInclude>
    375     <ClInclude Include="..\src\numeric.h">
    376       <Filter>src\...</Filter>
    377     </ClInclude>
    378     <ClInclude Include="..\src\platform.h">
    379       <Filter>src\...</Filter>
    380     </ClInclude>
    381     <ClInclude Include="..\src\profiler.h">
    382       <Filter>src\...</Filter>
    383     </ClInclude>
    384     <ClInclude Include="..\src\sample.h">
    385       <Filter>src\...</Filter>
    386     </ClInclude>
    387     <ClInclude Include="..\src\sampler.h">
    388       <Filter>src\...</Filter>
    389     </ClInclude>
    390     <ClInclude Include="..\src\scene.h">
    391       <Filter>src\...</Filter>
    392     </ClInclude>
    393     <ClInclude Include="..\src\simd.h">
    394       <Filter>src\...</Filter>
    395     </ClInclude>
    396     <ClInclude Include="..\src\sprite.h">
    397       <Filter>src\...</Filter>
    398     </ClInclude>
    399     <ClInclude Include="..\src\text.h">
    400       <Filter>src\...</Filter>
    401     </ClInclude>
    402     <ClInclude Include="..\src\ticker.h">
    403       <Filter>src\...</Filter>
    404     </ClInclude>
    405     <ClInclude Include="..\src\worldentity.h">
    406       <Filter>src\...</Filter>
    407     </ClInclude>
    408     <ClInclude Include="..\src\tiler.h">
    409       <Filter>src\...</Filter>
    410     </ClInclude>
    411     <ClInclude Include="..\src\tileset.h">
    412       <Filter>src\...</Filter>
    413     </ClInclude>
    414     <ClInclude Include="..\src\timer.h">
    415       <Filter>src\...</Filter>
    416     </ClInclude>
    417     <ClInclude Include="..\src\video.h">
    418       <Filter>src\...</Filter>
    419     </ClInclude>
    420     <ClInclude Include="..\src\world.h">
    421       <Filter>src\...</Filter>
    422     </ClInclude>
    423     <ClInclude Include="..\src\gpu\framebuffer.h">
    424       <Filter>src\gpu</Filter>
    425     </ClInclude>
    426     <ClInclude Include="..\src\generated\position.hh">
    427       <Filter>src\generated</Filter>
    428     </ClInclude>
    429     <ClInclude Include="..\src\generated\location.hh">
    430       <Filter>src\generated</Filter>
    431     </ClInclude>
    432     <ClInclude Include="..\src\generated\stack.hh">
    433       <Filter>src\generated</Filter>
    434     </ClInclude>
    435     <ClInclude Include="..\src\easymesh\easymesh.h">
    436       <Filter>src\easymesh</Filter>
    437     </ClInclude>
    438     <ClInclude Include="..\src\easymesh\easymesh-compiler.h">
    439       <Filter>src\easymesh</Filter>
    440     </ClInclude>
    441     <ClInclude Include="..\src\generated\easymesh-parser.h">
     321    <ClInclude Include="array.h">
     322      <Filter>src\...</Filter>
     323    </ClInclude>
     324    <ClInclude Include="hash.h">
     325      <Filter>src\...</Filter>
     326    </ClInclude>
     327    <ClInclude Include="audio.h">
     328      <Filter>src\...</Filter>
     329    </ClInclude>
     330    <ClInclude Include="bitfield.h">
     331      <Filter>src\...</Filter>
     332    </ClInclude>
     333    <ClInclude Include="camera.h">
     334      <Filter>src\...</Filter>
     335    </ClInclude>
     336    <ClInclude Include="core.h">
     337      <Filter>src\...</Filter>
     338    </ClInclude>
     339    <ClInclude Include="dict.h">
     340      <Filter>src\...</Filter>
     341    </ClInclude>
     342    <ClInclude Include="eglapp.h">
     343      <Filter>src\...</Filter>
     344    </ClInclude>
     345    <ClInclude Include="emitter.h">
     346      <Filter>src\...</Filter>
     347    </ClInclude>
     348    <ClInclude Include="entity.h">
     349      <Filter>src\...</Filter>
     350    </ClInclude>
     351    <ClInclude Include="font.h">
     352      <Filter>src\...</Filter>
     353    </ClInclude>
     354    <ClInclude Include="forge.h">
     355      <Filter>src\...</Filter>
     356    </ClInclude>
     357    <ClInclude Include="gradient.h">
     358      <Filter>src\...</Filter>
     359    </ClInclude>
     360    <ClInclude Include="layer.h">
     361      <Filter>src\...</Filter>
     362    </ClInclude>
     363    <ClInclude Include="log.h">
     364      <Filter>src\...</Filter>
     365    </ClInclude>
     366    <ClInclude Include="loldebug.h">
     367      <Filter>src\...</Filter>
     368    </ClInclude>
     369    <ClInclude Include="lolgl.h">
     370      <Filter>src\...</Filter>
     371    </ClInclude>
     372    <ClInclude Include="map.h">
     373      <Filter>src\...</Filter>
     374    </ClInclude>
     375    <ClInclude Include="numeric.h">
     376      <Filter>src\...</Filter>
     377    </ClInclude>
     378    <ClInclude Include="platform.h">
     379      <Filter>src\...</Filter>
     380    </ClInclude>
     381    <ClInclude Include="profiler.h">
     382      <Filter>src\...</Filter>
     383    </ClInclude>
     384    <ClInclude Include="sample.h">
     385      <Filter>src\...</Filter>
     386    </ClInclude>
     387    <ClInclude Include="sampler.h">
     388      <Filter>src\...</Filter>
     389    </ClInclude>
     390    <ClInclude Include="scene.h">
     391      <Filter>src\...</Filter>
     392    </ClInclude>
     393    <ClInclude Include="simd.h">
     394      <Filter>src\...</Filter>
     395    </ClInclude>
     396    <ClInclude Include="sprite.h">
     397      <Filter>src\...</Filter>
     398    </ClInclude>
     399    <ClInclude Include="text.h">
     400      <Filter>src\...</Filter>
     401    </ClInclude>
     402    <ClInclude Include="ticker.h">
     403      <Filter>src\...</Filter>
     404    </ClInclude>
     405    <ClInclude Include="worldentity.h">
     406      <Filter>src\...</Filter>
     407    </ClInclude>
     408    <ClInclude Include="tiler.h">
     409      <Filter>src\...</Filter>
     410    </ClInclude>
     411    <ClInclude Include="tileset.h">
     412      <Filter>src\...</Filter>
     413    </ClInclude>
     414    <ClInclude Include="timer.h">
     415      <Filter>src\...</Filter>
     416    </ClInclude>
     417    <ClInclude Include="video.h">
     418      <Filter>src\...</Filter>
     419    </ClInclude>
     420    <ClInclude Include="world.h">
     421      <Filter>src\...</Filter>
     422    </ClInclude>
     423    <ClInclude Include="gpu\framebuffer.h">
     424      <Filter>src\gpu</Filter>
     425    </ClInclude>
     426    <ClInclude Include="generated\position.hh">
     427      <Filter>src\generated</Filter>
     428    </ClInclude>
     429    <ClInclude Include="generated\location.hh">
     430      <Filter>src\generated</Filter>
     431    </ClInclude>
     432    <ClInclude Include="generated\stack.hh">
     433      <Filter>src\generated</Filter>
     434    </ClInclude>
     435    <ClInclude Include="easymesh\easymesh.h">
     436      <Filter>src\easymesh</Filter>
     437    </ClInclude>
     438    <ClInclude Include="easymesh\easymesh-compiler.h">
     439      <Filter>src\easymesh</Filter>
     440    </ClInclude>
     441    <ClInclude Include="generated\easymesh-parser.h">
    442442      <Filter>src\generated</Filter>
    443443    </ClInclude>
    444444  </ItemGroup>
    445445  <ItemGroup>
    446     <LolFxCompile Include="..\src\gpu\emptymaterial.lolfx">
     446    <LolFxCompile Include="gpu\emptymaterial.lolfx">
    447447      <Filter>src\gpu</Filter>
    448448    </LolFxCompile>
    449     <LolFxCompile Include="..\src\gpu\defaultmaterial.lolfx">
     449    <LolFxCompile Include="gpu\defaultmaterial.lolfx">
    450450      <Filter>src\gpu</Filter>
    451451    </LolFxCompile>
    452     <LolFxCompile Include="..\src\gpu\testmaterial.lolfx">
     452    <LolFxCompile Include="gpu\testmaterial.lolfx">
    453453      <Filter>src\gpu</Filter>
    454454    </LolFxCompile>
    455     <LolFxCompile Include="..\src\easymesh\shiny.lolfx">
     455    <LolFxCompile Include="easymesh\shiny.lolfx">
    456456      <Filter>src\easymesh</Filter>
    457457    </LolFxCompile>
    458458  </ItemGroup>
    459459  <ItemGroup>
    460     <None Include="..\src\easymesh\easymesh-parser.y">
     460    <None Include="easymesh\easymesh-parser.y">
    461461      <Filter>src\easymesh</Filter>
    462462    </None>
    463     <None Include="..\src\easymesh\easymesh-scanner.l">
     463    <None Include="easymesh\easymesh-scanner.l">
    464464      <Filter>src\easymesh</Filter>
    465465    </None>
  • trunk/test/Makefile.am

    r1318 r1518  
    11
    2 SUBDIRS = math tutorial sandbox xolotl
     2SUBDIRS = math sandbox xolotl
    33
    44AM_CPPFLAGS = -I$(top_srcdir)/src
  • trunk/test/benchsuite.vcxproj

    r1517 r1518  
    2828  </ItemGroup>
    2929  <ItemGroup>
    30     <ClCompile Include="..\test\benchmark\half.cpp" />
    31     <ClCompile Include="..\test\benchmark\real.cpp" />
    32     <ClCompile Include="..\test\benchmark\trig.cpp" />
    33     <ClCompile Include="..\test\benchmark\vector.cpp" />
    34     <ClCompile Include="..\test\benchsuite.cpp" />
     30    <ClCompile Include="benchmark\half.cpp" />
     31    <ClCompile Include="benchmark\real.cpp" />
     32    <ClCompile Include="benchmark\trig.cpp" />
     33    <ClCompile Include="benchmark\vector.cpp" />
     34    <ClCompile Include="benchsuite.cpp" />
    3535  </ItemGroup>
    3636  <ItemGroup>
  • trunk/test/debug/quad.vcxproj

    r1517 r1518  
    2828  </ItemGroup>
    2929  <ItemGroup>
    30     <ClCompile Include="..\test\debug\quad.cpp" />
     30    <ClCompile Include="quad.cpp" />
    3131  </ItemGroup>
    3232  <ItemGroup>
  • trunk/test/testsuite.vcxproj

    r1517 r1518  
    2828  </ItemGroup>
    2929  <ItemGroup>
    30     <ClCompile Include="..\test\tutorial\01_triangle.cpp" />
    31   </ItemGroup>
    32   <ItemGroup>
    33     <LolFxCompile Include="..\test\tutorial\01_triangle.lolfx" />
     30    <ClCompile Include="testsuite.cpp" />
     31    <ClCompile Include="unit\array.cpp" />
     32    <ClCompile Include="unit\build.cpp" />
     33    <ClCompile Include="unit\cmplx.cpp" />
     34    <ClCompile Include="unit\half.cpp" />
     35    <ClCompile Include="unit\image.cpp" />
     36    <ClCompile Include="unit\matrix.cpp" />
     37    <ClCompile Include="unit\quat.cpp" />
     38    <ClCompile Include="unit\real.cpp" />
     39    <ClCompile Include="unit\rotation.cpp" />
     40    <ClCompile Include="unit\trig.cpp" />
     41    <ClCompile Include="unit\vector.cpp" />
    3442  </ItemGroup>
    3543  <ItemGroup>
     
    3947  </ItemGroup>
    4048  <PropertyGroup Label="Globals">
    41     <ProjectGuid>{b92abadc-45be-4cc5-b724-9426053123a1}</ProjectGuid>
     49    <ProjectGuid>{80F81C11-8DA2-4990-91CB-9807783BA46E}</ProjectGuid>
    4250    <ConfigurationType>Application</ConfigurationType>
    4351    <Keyword>Win32Proj</Keyword>
  • trunk/tutorial/01_triangle.vcxproj

    r1517 r1518  
    2828  </ItemGroup>
    2929  <ItemGroup>
    30     <ClCompile Include="..\test\tutorial\01_triangle.cpp" />
     30    <ClCompile Include="01_triangle.cpp" />
    3131  </ItemGroup>
    3232  <ItemGroup>
    33     <LolFxCompile Include="..\test\tutorial\01_triangle.lolfx" />
     33    <LolFxCompile Include="01_triangle.lolfx" />
    3434  </ItemGroup>
    3535  <ItemGroup>
  • trunk/tutorial/02_cube.vcxproj

    r1517 r1518  
    2828  </ItemGroup>
    2929  <ItemGroup>
    30     <ClCompile Include="..\test\tutorial\02_cube.cpp" />
     30    <ClCompile Include="02_cube.cpp" />
    3131  </ItemGroup>
    3232  <ItemGroup>
    33     <LolFxCompile Include="..\test\tutorial\02_cube.lolfx" />
     33    <LolFxCompile Include="02_cube.lolfx" />
    3434  </ItemGroup>
    3535  <ItemGroup>
  • trunk/tutorial/11_fractal.cpp

    r1517 r1518  
    3636#endif
    3737
    38 extern char const *lolfx_03_fractal;
     38extern char const *lolfx_11_fractal;
    3939
    4040#if defined USE_D3D9
     
    479479#endif
    480480
    481             m_shader = Shader::Create(lolfx_03_fractal);
     481            m_shader = Shader::Create(lolfx_11_fractal);
    482482
    483483            m_vertexattrib = m_shader->GetAttribLocation("a_Vertex", VertexUsage::Position, 0);
  • trunk/tutorial/11_fractal.vcxproj

    r1517 r1518  
    2828  </ItemGroup>
    2929  <ItemGroup>
    30     <ClCompile Include="..\test\tutorial\03_fractal.cpp" />
     30    <ClCompile Include="11_fractal.cpp" />
    3131  </ItemGroup>
    3232  <ItemGroup>
    33     <LolFxCompile Include="..\test\tutorial\03_fractal.lolfx" />
     33    <LolFxCompile Include="11_fractal.lolfx" />
    3434  </ItemGroup>
    3535  <ItemGroup>
  • trunk/tutorial/Makefile.am

    r1517 r1518  
    1919         echo ";") | $(CXXCOMPILE) -xc++ -c - -o $@
    2020
    21 noinst_PROGRAMS = 01_triangle 02_cube 03_fractal
     21noinst_PROGRAMS = 01_triangle 02_cube 11_fractal
    2222
    232301_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
     
    313102_cube_DEPENDENCIES = $(top_builddir)/src/liblol.a
    3232
    33 03_fractal_SOURCES = 03_fractal.cpp 03_fractal.lolfx
    34 03_fractal_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    35 03_fractal_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
    36 03_fractal_DEPENDENCIES = $(top_builddir)/src/liblol.a
     3311_fractal_SOURCES = 11_fractal.cpp 11_fractal.lolfx
     3411_fractal_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
     3511_fractal_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     3611_fractal_DEPENDENCIES = $(top_builddir)/src/liblol.a
    3737
Note: See TracChangeset for help on using the changeset viewer.