Changeset 1518 for trunk/tutorialTweet

Timestamp:

Jun 24, 2012, 1:19:11 PM (10 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:

• . (added)
• 01_triangle.cpp (moved) (moved from trunk/test/tutorial/01_triangle.cpp)
• 01_triangle.lolfx (moved) (moved from trunk/test/tutorial/01_triangle.lolfx)
• 01_triangle.vcxproj (copied) (copied from trunk/win32/01_triangle.vcxproj) (1 diff)
• 02_cube.cpp (moved) (moved from trunk/test/tutorial/02_cube.cpp)
• 02_cube.lolfx (moved) (moved from trunk/test/tutorial/02_cube.lolfx)
• 02_cube.vcxproj (moved) (moved from trunk/win32/02_cube.vcxproj) (1 diff)
• 11_fractal.cpp (moved) (moved from trunk/test/tutorial/03_fractal.cpp) (2 diffs)
• 11_fractal.lolfx (moved) (moved from trunk/test/tutorial/03_fractal.lolfx)
• 11_fractal.vcxproj (moved) (moved from trunk/win32/03_fractal.vcxproj) (1 diff)
• Makefile.am (moved) (moved from trunk/test/tutorial/Makefile.am) (2 diffs)

trunk/tutorial/01_triangle.vcxproj

@@ -28 +28 @@
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\test\tutorial\01_triangle.cpp" />
+    <ClCompile Include="01_triangle.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <LolFxCompile Include="..\test\tutorial\01_triangle.lolfx" />
+    <LolFxCompile Include="01_triangle.lolfx" />
   </ItemGroup>
   <ItemGroup>

trunk/tutorial/02_cube.vcxproj

@@ -28 +28 @@
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\test\tutorial\02_cube.cpp" />
+    <ClCompile Include="02_cube.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <LolFxCompile Include="..\test\tutorial\02_cube.lolfx" />
+    <LolFxCompile Include="02_cube.lolfx" />
   </ItemGroup>
   <ItemGroup>

trunk/tutorial/11_fractal.cpp

@@ -36 +36 @@
 #endif
 
-extern char const *lolfx_03_fractal;
+extern char const *lolfx_11_fractal;
 
 #if defined USE_D3D9
@@ -479 +479 @@
 #endif
 
-            m_shader = Shader::Create(lolfx_03_fractal);
+            m_shader = Shader::Create(lolfx_11_fractal);
 
             m_vertexattrib = m_shader->GetAttribLocation("a_Vertex", VertexUsage::Position, 0);

trunk/tutorial/11_fractal.vcxproj

@@ -28 +28 @@
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\test\tutorial\03_fractal.cpp" />
+    <ClCompile Include="11_fractal.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <LolFxCompile Include="..\test\tutorial\03_fractal.lolfx" />
+    <LolFxCompile Include="11_fractal.lolfx" />
   </ItemGroup>
   <ItemGroup>

trunk/tutorial/Makefile.am

@@ -19 +19 @@
          echo ";") | $(CXXCOMPILE) -xc++ -c - -o $@
 
-noinst_PROGRAMS = 01_triangle 02_cube 03_fractal
+noinst_PROGRAMS = 01_triangle 02_cube 11_fractal
 
 01_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
@@ -31 +31 @@
 02_cube_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
-03_fractal_SOURCES = 03_fractal.cpp 03_fractal.lolfx
-03_fractal_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-03_fractal_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
-03_fractal_DEPENDENCIES = $(top_builddir)/src/liblol.a
+11_fractal_SOURCES = 11_fractal.cpp 11_fractal.lolfx
+11_fractal_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
+11_fractal_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+11_fractal_DEPENDENCIES = $(top_builddir)/src/liblol.a