Changeset 1518 for trunk/tutorial


Ignore:
Timestamp:
Jun 24, 2012, 1:19:11 PM (8 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/tutorial
Files:
1 added
1 copied
9 moved

Legend:

Unmodified
Added
Removed
  • 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.