From ba0e467a2e9bf4d303969ed08367419be15fb320 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sun, 28 Aug 2016 12:38:15 +0000 Subject: [PATCH] build: rename liblolcore to liblol-core, etc. --- build/Lol (vs2015).sln | 6 +++--- build/lol-build | 2 +- configure.ac | 6 +++--- doc/samples/benchsuite.vcxproj | 6 +++--- doc/samples/btphystest.vcxproj | 6 +++--- doc/samples/meshviewer/meshviewer.vcxproj | 6 +++--- doc/samples/nacl_phystest.vcxproj | 6 +++--- doc/tutorial/01_triangle.vcxproj | 6 +++--- doc/tutorial/02_cube.vcxproj | 6 +++--- doc/tutorial/03_noise.vcxproj | 6 +++--- doc/tutorial/04_texture.vcxproj | 6 +++--- doc/tutorial/05_easymesh.vcxproj | 6 +++--- doc/tutorial/06_sprite.vcxproj | 6 +++--- doc/tutorial/07_input.vcxproj | 6 +++--- doc/tutorial/08_fbo.vcxproj | 6 +++--- doc/tutorial/11_fractal.vcxproj | 6 +++--- doc/tutorial/12_voronoi.vcxproj | 6 +++--- doc/tutorial/13_shader_builder.vcxproj | 6 +++--- doc/tutorial/14_lol_lua.vcxproj | 6 +++--- src/Makefile.am | 16 ++++++++-------- src/bullet/Makefile.am | 6 +++--- .../{lolbullet.vcxproj => lol-bullet.vcxproj} | 0 ...cxproj.filters => lol-bullet.vcxproj.filters} | 0 src/{lolcore.vcxproj => lol-core.vcxproj} | 4 ++-- ...e.vcxproj.filters => lol-core.vcxproj.filter} | 0 src/lua/Makefile.am | 6 +++--- src/lua/{lollua.vcxproj => lol-lua.vcxproj} | 0 ...a.vcxproj.filters => lol-lua.vcxproj.filters} | 0 src/t/test-base.vcxproj | 6 +++--- src/t/test-entity.vcxproj | 6 +++--- src/t/test-image.vcxproj | 6 +++--- src/t/test-math.vcxproj | 6 +++--- src/t/test-sys.vcxproj | 6 +++--- tools/lolremez/lolremez.vcxproj | 6 +++--- 34 files changed, 89 insertions(+), 89 deletions(-) rename src/bullet/{lolbullet.vcxproj => lol-bullet.vcxproj} (100%) rename src/bullet/{lolbullet.vcxproj.filters => lol-bullet.vcxproj.filters} (100%) rename src/{lolcore.vcxproj => lol-core.vcxproj} (97%) rename src/{lolcore.vcxproj.filters => lol-core.vcxproj.filter} (100%) rename src/lua/{lollua.vcxproj => lol-lua.vcxproj} (100%) rename src/lua/{lollua.vcxproj.filters => lol-lua.vcxproj.filters} (100%) diff --git a/build/Lol (vs2015).sln b/build/Lol (vs2015).sln index cdd7912c..450a2d71 100644 --- a/build/Lol (vs2015).sln +++ b/build/Lol (vs2015).sln @@ -13,11 +13,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deus Hax", "Deus Hax", "{08 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Monsterz", "Monsterz", "{2F87CEAB-4818-443C-A5E3-6C34E7D967EC}" 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 -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 -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 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-base", "..\src\t\test-base.vcxproj", "{8F59A635-0240-4D7F-A80D-050C3F1670C2}" EndProject diff --git a/build/lol-build b/build/lol-build index 0c86fd4d..b5f2b5e2 100755 --- a/build/lol-build +++ b/build/lol-build @@ -293,7 +293,7 @@ build() # build the static libraries in parallel. make -j$LOL_PARALLEL -C src/bullet 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 ;; *) diff --git a/configure.ac b/configure.ac index b72f7515..d9f04df8 100644 --- a/configure.ac +++ b/configure.ac @@ -437,9 +437,9 @@ AC_SUBST(UTIL_LIBS) dnl How to use the Lol Engine outside this tree 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_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 AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/src" diff --git a/doc/samples/benchsuite.vcxproj b/doc/samples/benchsuite.vcxproj index d669166c..187f285e 100644 --- a/doc/samples/benchsuite.vcxproj +++ b/doc/samples/benchsuite.vcxproj @@ -34,13 +34,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/samples/btphystest.vcxproj b/doc/samples/btphystest.vcxproj index 08379e83..23d1a630 100644 --- a/doc/samples/btphystest.vcxproj +++ b/doc/samples/btphystest.vcxproj @@ -44,13 +44,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/samples/meshviewer/meshviewer.vcxproj b/doc/samples/meshviewer/meshviewer.vcxproj index 0dd5c884..338578ac 100644 --- a/doc/samples/meshviewer/meshviewer.vcxproj +++ b/doc/samples/meshviewer/meshviewer.vcxproj @@ -31,13 +31,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/samples/nacl_phystest.vcxproj b/doc/samples/nacl_phystest.vcxproj index 65fe24cb..2b81ef5e 100644 --- a/doc/samples/nacl_phystest.vcxproj +++ b/doc/samples/nacl_phystest.vcxproj @@ -33,13 +33,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/tutorial/01_triangle.vcxproj b/doc/tutorial/01_triangle.vcxproj index 5059d5b8..33d93303 100644 --- a/doc/tutorial/01_triangle.vcxproj +++ b/doc/tutorial/01_triangle.vcxproj @@ -33,13 +33,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/tutorial/02_cube.vcxproj b/doc/tutorial/02_cube.vcxproj index 23bee158..215e666d 100644 --- a/doc/tutorial/02_cube.vcxproj +++ b/doc/tutorial/02_cube.vcxproj @@ -33,13 +33,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/tutorial/03_noise.vcxproj b/doc/tutorial/03_noise.vcxproj index dd991e68..cde4fc38 100644 --- a/doc/tutorial/03_noise.vcxproj +++ b/doc/tutorial/03_noise.vcxproj @@ -33,13 +33,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/tutorial/04_texture.vcxproj b/doc/tutorial/04_texture.vcxproj index 3dc9cffb..472e27e4 100644 --- a/doc/tutorial/04_texture.vcxproj +++ b/doc/tutorial/04_texture.vcxproj @@ -33,13 +33,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/tutorial/05_easymesh.vcxproj b/doc/tutorial/05_easymesh.vcxproj index 56f51aee..66ea7778 100644 --- a/doc/tutorial/05_easymesh.vcxproj +++ b/doc/tutorial/05_easymesh.vcxproj @@ -30,13 +30,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/tutorial/06_sprite.vcxproj b/doc/tutorial/06_sprite.vcxproj index 700d7859..d50e4940 100644 --- a/doc/tutorial/06_sprite.vcxproj +++ b/doc/tutorial/06_sprite.vcxproj @@ -30,13 +30,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/tutorial/07_input.vcxproj b/doc/tutorial/07_input.vcxproj index a32b22cc..89d1d231 100644 --- a/doc/tutorial/07_input.vcxproj +++ b/doc/tutorial/07_input.vcxproj @@ -33,13 +33,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/tutorial/08_fbo.vcxproj b/doc/tutorial/08_fbo.vcxproj index cbf8604e..b06901e9 100644 --- a/doc/tutorial/08_fbo.vcxproj +++ b/doc/tutorial/08_fbo.vcxproj @@ -33,13 +33,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/tutorial/11_fractal.vcxproj b/doc/tutorial/11_fractal.vcxproj index cd57b5cb..9b4a206f 100644 --- a/doc/tutorial/11_fractal.vcxproj +++ b/doc/tutorial/11_fractal.vcxproj @@ -33,13 +33,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/tutorial/12_voronoi.vcxproj b/doc/tutorial/12_voronoi.vcxproj index 4050a338..5062f010 100644 --- a/doc/tutorial/12_voronoi.vcxproj +++ b/doc/tutorial/12_voronoi.vcxproj @@ -37,13 +37,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/tutorial/13_shader_builder.vcxproj b/doc/tutorial/13_shader_builder.vcxproj index a8ea22cd..edf7bb4d 100644 --- a/doc/tutorial/13_shader_builder.vcxproj +++ b/doc/tutorial/13_shader_builder.vcxproj @@ -27,13 +27,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/doc/tutorial/14_lol_lua.vcxproj b/doc/tutorial/14_lol_lua.vcxproj index 484991c8..b058e734 100644 --- a/doc/tutorial/14_lol_lua.vcxproj +++ b/doc/tutorial/14_lol_lua.vcxproj @@ -27,13 +27,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/src/Makefile.am b/src/Makefile.am index 1ed61609..b8643c54 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,9 +3,9 @@ include $(top_srcdir)/build/autotools/common.am 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 \ audio.cpp audio.h scene.cpp scene.h font.cpp font.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 \ light.cpp light.h lolimgui.cpp lolimgui.h \ \ - $(liblolcore_headers) \ - $(liblolcore_sources) \ + $(liblol_core_headers) \ + $(liblol_core_sources) \ \ $(xbox_sources) \ $(nacl_sources) \ $(sdl_sources) \ $(d3d9_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 -liblolcore_headers = \ +liblol_core_headers = \ lol/engine-internal.h lol/engine.h lol/public.h lol/extras.h \ \ lol/base/all.h \ @@ -63,7 +63,7 @@ liblolcore_headers = \ lol/debug/all.h \ lol/debug/lines.h -liblolcore_sources = \ +liblol_core_sources = \ application/application.cpp application/application.h \ \ lolua/baselua.cpp lolua/baselua.h \ diff --git a/src/bullet/Makefile.am b/src/bullet/Makefile.am index 60ef4eac..11c51fe4 100644 --- a/src/bullet/Makefile.am +++ b/src/bullet/Makefile.am @@ -1,7 +1,7 @@ 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 # what the compiler actually accepts. @@ -10,8 +10,8 @@ disable_cflags = $(filter $(AM_CPPFLAGS:-W%=-Wno-%), \ -Wno-reorder -Wno-maybe-uninitialized -Wno-narrowing \ -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 = diff --git a/src/bullet/lolbullet.vcxproj b/src/bullet/lol-bullet.vcxproj similarity index 100% rename from src/bullet/lolbullet.vcxproj rename to src/bullet/lol-bullet.vcxproj diff --git a/src/bullet/lolbullet.vcxproj.filters b/src/bullet/lol-bullet.vcxproj.filters similarity index 100% rename from src/bullet/lolbullet.vcxproj.filters rename to src/bullet/lol-bullet.vcxproj.filters diff --git a/src/lolcore.vcxproj b/src/lol-core.vcxproj similarity index 97% rename from src/lolcore.vcxproj rename to src/lol-core.vcxproj index 69969fa1..67669d84 100644 --- a/src/lolcore.vcxproj +++ b/src/lol-core.vcxproj @@ -381,10 +381,10 @@ - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/src/lolcore.vcxproj.filters b/src/lol-core.vcxproj.filter similarity index 100% rename from src/lolcore.vcxproj.filters rename to src/lol-core.vcxproj.filter diff --git a/src/lua/Makefile.am b/src/lua/Makefile.am index e1817acd..127032be 100644 --- a/src/lua/Makefile.am +++ b/src/lua/Makefile.am @@ -1,10 +1,10 @@ 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 = \ lapi.c lapi.h lauxlib.c lauxlib.h lbaselib.c lbitlib.c \ diff --git a/src/lua/lollua.vcxproj b/src/lua/lol-lua.vcxproj similarity index 100% rename from src/lua/lollua.vcxproj rename to src/lua/lol-lua.vcxproj diff --git a/src/lua/lollua.vcxproj.filters b/src/lua/lol-lua.vcxproj.filters similarity index 100% rename from src/lua/lollua.vcxproj.filters rename to src/lua/lol-lua.vcxproj.filters diff --git a/src/t/test-base.vcxproj b/src/t/test-base.vcxproj index 083186f9..b35d036e 100644 --- a/src/t/test-base.vcxproj +++ b/src/t/test-base.vcxproj @@ -35,13 +35,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/src/t/test-entity.vcxproj b/src/t/test-entity.vcxproj index 6ba31fe4..8102222c 100644 --- a/src/t/test-entity.vcxproj +++ b/src/t/test-entity.vcxproj @@ -31,13 +31,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/src/t/test-image.vcxproj b/src/t/test-image.vcxproj index ccec3c8d..14300e36 100644 --- a/src/t/test-image.vcxproj +++ b/src/t/test-image.vcxproj @@ -32,13 +32,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/src/t/test-math.vcxproj b/src/t/test-math.vcxproj index 7a1fa4d0..642c8bb0 100644 --- a/src/t/test-math.vcxproj +++ b/src/t/test-math.vcxproj @@ -48,13 +48,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/src/t/test-sys.vcxproj b/src/t/test-sys.vcxproj index 7635a5c9..66b56728 100644 --- a/src/t/test-sys.vcxproj +++ b/src/t/test-sys.vcxproj @@ -31,13 +31,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} diff --git a/tools/lolremez/lolremez.vcxproj b/tools/lolremez/lolremez.vcxproj index b4f91b62..8137b11d 100644 --- a/tools/lolremez/lolremez.vcxproj +++ b/tools/lolremez/lolremez.vcxproj @@ -36,13 +36,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4}