lolengine
/
lol
mirror of https://github.com/lolengine/lol
1
0
Fork 0
Code Issues 0 Releases 0 Wiki Activity
Browse Source

build: rename liblolcore to liblol-core, etc.

undefined
Sam Hocevar 8 years ago
parent
52529cd8b9
commit
ba0e467a2e
34 changed files with 89 additions and 89 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -3
      build/Lol (vs2015).sln
  2. +1
    -1
      build/lol-build
  3. +3
    -3
      configure.ac
  4. +3
    -3
      doc/samples/benchsuite.vcxproj
  5. +3
    -3
      doc/samples/btphystest.vcxproj
  6. +3
    -3
      doc/samples/meshviewer/meshviewer.vcxproj
  7. +3
    -3
      doc/samples/nacl_phystest.vcxproj
  8. +3
    -3
      doc/tutorial/01_triangle.vcxproj
  9. +3
    -3
      doc/tutorial/02_cube.vcxproj
  10. +3
    -3
      doc/tutorial/03_noise.vcxproj
  11. +3
    -3
      doc/tutorial/04_texture.vcxproj
  12. +3
    -3
      doc/tutorial/05_easymesh.vcxproj
  13. +3
    -3
      doc/tutorial/06_sprite.vcxproj
  14. +3
    -3
      doc/tutorial/07_input.vcxproj
  15. +3
    -3
      doc/tutorial/08_fbo.vcxproj
  16. +3
    -3
      doc/tutorial/11_fractal.vcxproj
  17. +3
    -3
      doc/tutorial/12_voronoi.vcxproj
  18. +3
    -3
      doc/tutorial/13_shader_builder.vcxproj
  19. +3
    -3
      doc/tutorial/14_lol_lua.vcxproj
  20. +8
    -8
      src/Makefile.am
  21. +3
    -3
      src/bullet/Makefile.am
  22. +0
    -0
      src/bullet/lol-bullet.vcxproj
  23. +0
    -0
      src/bullet/lol-bullet.vcxproj.filters
  24. +2
    -2
      src/lol-core.vcxproj
  25. +0
    -0
      src/lol-core.vcxproj.filter
  26. +3
    -3
      src/lua/Makefile.am
  27. +0
    -0
      src/lua/lol-lua.vcxproj
  28. +0
    -0
      src/lua/lol-lua.vcxproj.filters
  29. +3
    -3
      src/t/test-base.vcxproj
  30. +3
    -3
      src/t/test-entity.vcxproj
  31. +3
    -3
      src/t/test-image.vcxproj
  32. +3
    -3
      src/t/test-math.vcxproj
  33. +3
    -3
      src/t/test-sys.vcxproj
  34. +3
    -3
      tools/lolremez/lolremez.vcxproj

+ 3
- 3
build/Lol (vs2015).sln View File

@@ -13,11 +13,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deus Hax", "Deus Hax", "{08
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Monsterz", "Monsterz", "{2F87CEAB-4818-443C-A5E3-6C34E7D967EC}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Monsterz", "Monsterz", "{2F87CEAB-4818-443C-A5E3-6C34E7D967EC}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolcore", "..\src\lolcore.vcxproj", "{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol-core", "..\src\lol-core.vcxproj", "{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolbullet", "..\src\bullet\lolbullet.vcxproj", "{83D3B207-C601-4025-8F41-01DEDC354661}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol-bullet", "..\src\bullet\lol-bullet.vcxproj", "{83D3B207-C601-4025-8F41-01DEDC354661}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lollua", "..\src\lua\lollua.vcxproj", "{D84021CA-B233-4E0F-8A52-071B83BBCCC4}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol-lua", "..\src\lua\lol-lua.vcxproj", "{D84021CA-B233-4E0F-8A52-071B83BBCCC4}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-base", "..\src\t\test-base.vcxproj", "{8F59A635-0240-4D7F-A80D-050C3F1670C2}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-base", "..\src\t\test-base.vcxproj", "{8F59A635-0240-4D7F-A80D-050C3F1670C2}"
EndProject EndProject


+ 1
- 1
build/lol-build View File

@@ -293,7 +293,7 @@ build()
# build the static libraries in parallel. # build the static libraries in parallel.
make -j$LOL_PARALLEL -C src/bullet make -j$LOL_PARALLEL -C src/bullet
make -j$LOL_PARALLEL -C src/lua make -j$LOL_PARALLEL -C src/lua
make -j$LOL_PARALLEL -C src/ liblolcore.a
make -j$LOL_PARALLEL -C src/ liblol-core.a
make make
;; ;;
*) *)


+ 3
- 3
configure.ac View File

@@ -437,9 +437,9 @@ AC_SUBST(UTIL_LIBS)
dnl How to use the Lol Engine outside this tree dnl How to use the Lol Engine outside this tree
LOL_CFLAGS="$LOL_CFLAGS $SDL_CFLAGS $GL_CFLAGS $EGL_CFLAGS $LIBPNG_CFLAGS" LOL_CFLAGS="$LOL_CFLAGS $SDL_CFLAGS $GL_CFLAGS $EGL_CFLAGS $LIBPNG_CFLAGS"
LOL_LIBS="$LOL_LIBS $SDL_LIBS $GL_LIBS $EGL_LIBS $LIBPNG_LIBS $D3D_LIBS" LOL_LIBS="$LOL_LIBS $SDL_LIBS $GL_LIBS $EGL_LIBS $LIBPNG_LIBS $D3D_LIBS"
LOL_DEPS="${LOL_DEPS} \$(top_builddir)/src/liblolcore.a"
LOL_DEPS="${LOL_DEPS} \$(top_builddir)/src/bullet/liblolbullet.a"
LOL_DEPS="${LOL_DEPS} \$(top_builddir)/src/lua/liblollua.a"
LOL_DEPS="${LOL_DEPS} \$(top_builddir)/src/liblol-core.a"
LOL_DEPS="${LOL_DEPS} \$(top_builddir)/src/bullet/liblol-bullet.a"
LOL_DEPS="${LOL_DEPS} \$(top_builddir)/src/lua/liblol-lua.a"


dnl How to use the Lol Engine inside this tree dnl How to use the Lol Engine inside this tree
AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/src" AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/src"


+ 3
- 3
doc/samples/benchsuite.vcxproj View File

@@ -34,13 +34,13 @@
<ClCompile Include="benchsuite.cpp" /> <ClCompile Include="benchsuite.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/samples/btphystest.vcxproj View File

@@ -44,13 +44,13 @@
<ClCompile Include="physics\easyphysics.cpp" /> <ClCompile Include="physics\easyphysics.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/samples/meshviewer/meshviewer.vcxproj View File

@@ -31,13 +31,13 @@
<ClCompile Include="scenesetup.cpp" /> <ClCompile Include="scenesetup.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/samples/nacl_phystest.vcxproj View File

@@ -33,13 +33,13 @@
<ClCompile Include="nacl_phystest.cpp" /> <ClCompile Include="nacl_phystest.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/tutorial/01_triangle.vcxproj View File

@@ -33,13 +33,13 @@
<LolFxCompile Include="01_triangle.lolfx" /> <LolFxCompile Include="01_triangle.lolfx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/tutorial/02_cube.vcxproj View File

@@ -33,13 +33,13 @@
<LolFxCompile Include="02_cube.lolfx" /> <LolFxCompile Include="02_cube.lolfx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/tutorial/03_noise.vcxproj View File

@@ -33,13 +33,13 @@
<LolFxCompile Include="03_noise.lolfx" /> <LolFxCompile Include="03_noise.lolfx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/tutorial/04_texture.vcxproj View File

@@ -33,13 +33,13 @@
<LolFxCompile Include="04_texture.lolfx" /> <LolFxCompile Include="04_texture.lolfx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/tutorial/05_easymesh.vcxproj View File

@@ -30,13 +30,13 @@
<ClCompile Include="05_easymesh.cpp" /> <ClCompile Include="05_easymesh.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/tutorial/06_sprite.vcxproj View File

@@ -30,13 +30,13 @@
<ClCompile Include="06_sprite.cpp" /> <ClCompile Include="06_sprite.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/tutorial/07_input.vcxproj View File

@@ -33,13 +33,13 @@
<LolFxCompile Include="07_input.lolfx" /> <LolFxCompile Include="07_input.lolfx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/tutorial/08_fbo.vcxproj View File

@@ -33,13 +33,13 @@
<LolFxCompile Include="08_fbo.lolfx" /> <LolFxCompile Include="08_fbo.lolfx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/tutorial/11_fractal.vcxproj View File

@@ -33,13 +33,13 @@
<LolFxCompile Include="11_fractal.lolfx" /> <LolFxCompile Include="11_fractal.lolfx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/tutorial/12_voronoi.vcxproj View File

@@ -37,13 +37,13 @@
<LolFxCompile Include="12_distance.lolfx" /> <LolFxCompile Include="12_distance.lolfx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/tutorial/13_shader_builder.vcxproj View File

@@ -27,13 +27,13 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
doc/tutorial/14_lol_lua.vcxproj View File

@@ -27,13 +27,13 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 8
- 8
src/Makefile.am View File

@@ -3,9 +3,9 @@ include $(top_srcdir)/build/autotools/common.am


SUBDIRS = bullet lua data . t SUBDIRS = bullet lua data . t


noinst_LIBRARIES = liblolcore.a
noinst_LIBRARIES = liblol-core.a


liblolcore_a_SOURCES = \
liblol_core_a_SOURCES = \
tiler.cpp tiler.h dict.cpp dict.h lolgl.h \ tiler.cpp tiler.h dict.cpp dict.h lolgl.h \
audio.cpp audio.h scene.cpp scene.h font.cpp font.h \ audio.cpp audio.h scene.cpp scene.h font.cpp font.h \
textureimage.cpp textureimage.h tileset.cpp tileset.h \ textureimage.cpp textureimage.h tileset.cpp tileset.h \
@@ -17,20 +17,20 @@ liblolcore_a_SOURCES = \
platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \ platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \
light.cpp light.h lolimgui.cpp lolimgui.h \ light.cpp light.h lolimgui.cpp lolimgui.h \
\ \
$(liblolcore_headers) \
$(liblolcore_sources) \
$(liblol_core_headers) \
$(liblol_core_sources) \
\ \
$(xbox_sources) \ $(xbox_sources) \
$(nacl_sources) \ $(nacl_sources) \
$(sdl_sources) \ $(sdl_sources) \
$(d3d9_sources) \ $(d3d9_sources) \
$(android_sources) $(android_sources)
#liblolcore_a_CPPFLAGS = -include-pch $(srcdir)/lol/engine-internal.h.pch $(AM_CPPFLAGS) -I$(srcdir)/bullet -I$(srcdir)/lua
liblolcore_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/bullet -I$(srcdir)/lua
#liblol_core_a_CPPFLAGS = -include-pch $(srcdir)/lol/engine-internal.h.pch $(AM_CPPFLAGS) -I$(srcdir)/bullet -I$(srcdir)/lua
liblol_core_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/bullet -I$(srcdir)/lua


EXTRA_DIST += easymesh/easymesh-scanner.l easymesh/easymesh-parser.y EXTRA_DIST += easymesh/easymesh-scanner.l easymesh/easymesh-parser.y


liblolcore_headers = \
liblol_core_headers = \
lol/engine-internal.h lol/engine.h lol/public.h lol/extras.h \ lol/engine-internal.h lol/engine.h lol/public.h lol/extras.h \
\ \
lol/base/all.h \ lol/base/all.h \
@@ -63,7 +63,7 @@ liblolcore_headers = \
lol/debug/all.h \ lol/debug/all.h \
lol/debug/lines.h lol/debug/lines.h


liblolcore_sources = \
liblol_core_sources = \
application/application.cpp application/application.h \ application/application.cpp application/application.h \
\ \
lolua/baselua.cpp lolua/baselua.h \ lolua/baselua.cpp lolua/baselua.h \


+ 3
- 3
src/bullet/Makefile.am View File

@@ -1,7 +1,7 @@


include $(top_srcdir)/build/autotools/common.am include $(top_srcdir)/build/autotools/common.am


noinst_LIBRARIES = liblolbullet.a
noinst_LIBRARIES = liblol-bullet.a


# Only remove flags that were actually set, because we don't know # Only remove flags that were actually set, because we don't know
# what the compiler actually accepts. # what the compiler actually accepts.
@@ -10,8 +10,8 @@ disable_cflags = $(filter $(AM_CPPFLAGS:-W%=-Wno-%), \
-Wno-reorder -Wno-maybe-uninitialized -Wno-narrowing \ -Wno-reorder -Wno-maybe-uninitialized -Wno-narrowing \
-Wno-parentheses) -Wno-parentheses)


liblolbullet_a_SOURCES = $(bullet_sources)
liblolbullet_a_CPPFLAGS = -DB3_USE_CLEW $(AM_CPPFLAGS) -I$(srcdir) $(disable_cflags)
liblol_bullet_a_SOURCES = $(bullet_sources)
liblol_bullet_a_CPPFLAGS = -DB3_USE_CLEW $(AM_CPPFLAGS) -I$(srcdir) $(disable_cflags)


bullet_sources = bullet_sources =




src/bullet/lolbullet.vcxproj → src/bullet/lol-bullet.vcxproj View File


src/bullet/lolbullet.vcxproj.filters → src/bullet/lol-bullet.vcxproj.filters View File


src/lolcore.vcxproj → src/lol-core.vcxproj View File

@@ -381,10 +381,10 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="bullet\lolbullet.vcxproj">
<ProjectReference Include="bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="lua\lollua.vcxproj">
<ProjectReference Include="lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>

src/lolcore.vcxproj.filters → src/lol-core.vcxproj.filter View File


+ 3
- 3
src/lua/Makefile.am View File

@@ -1,10 +1,10 @@


include $(top_srcdir)/build/autotools/common.am include $(top_srcdir)/build/autotools/common.am


noinst_LIBRARIES = liblollua.a
noinst_LIBRARIES = liblol-lua.a


liblollua_a_SOURCES = $(lua_sources)
liblollua_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_ANSI
liblol_lua_a_SOURCES = $(lua_sources)
liblol_lua_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_ANSI


lua_sources = \ lua_sources = \
lapi.c lapi.h lauxlib.c lauxlib.h lbaselib.c lbitlib.c \ lapi.c lapi.h lauxlib.c lauxlib.h lbaselib.c lbitlib.c \


src/lua/lollua.vcxproj → src/lua/lol-lua.vcxproj View File


src/lua/lollua.vcxproj.filters → src/lua/lol-lua.vcxproj.filters View File


+ 3
- 3
src/t/test-base.vcxproj View File

@@ -35,13 +35,13 @@
<ClCompile Include="base\types.cpp" /> <ClCompile Include="base\types.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
src/t/test-entity.vcxproj View File

@@ -31,13 +31,13 @@
<ClCompile Include="entity\camera.cpp" /> <ClCompile Include="entity\camera.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
src/t/test-image.vcxproj View File

@@ -32,13 +32,13 @@
<ClCompile Include="image\image.cpp" /> <ClCompile Include="image\image.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
src/t/test-math.vcxproj View File

@@ -48,13 +48,13 @@
<ClCompile Include="math\vector.cpp" /> <ClCompile Include="math\vector.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
src/t/test-sys.vcxproj View File

@@ -31,13 +31,13 @@
<ClCompile Include="sys\thread.cpp" /> <ClCompile Include="sys\thread.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


+ 3
- 3
tools/lolremez/lolremez.vcxproj View File

@@ -36,13 +36,13 @@
<ClCompile Include="solver.cpp" /> <ClCompile Include="solver.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lol-core.vcxproj">
<Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\bullet\lol-bullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project> <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
<ProjectReference Include="$(SolutionDir)\..\src\lua\lol-lua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project> <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>


Write Preview
Loading…
Cancel
Save