Browse Source

build: update build files and add external git submodule.

legacy
Sam Hocevar 8 years ago
parent
commit
b660d52e61
7 changed files with 13 additions and 72 deletions
  1. +1
    -0
      .gitignore
  2. +3
    -0
      .gitmodules
  3. +1
    -1
      Makefile.am
  4. +3
    -0
      bootstrap
  5. +4
    -68
      configure.ac
  6. +1
    -0
      external
  7. +0
    -3
      tools/Makefile.am

+ 1
- 0
.gitignore View File

@@ -98,6 +98,7 @@ doc/tutorial/08_fbo
doc/tutorial/11_fractal
doc/tutorial/12_voronoi
doc/tutorial/13_shader_builder
doc/tutorial/14_lol_lua
tools/make-font
# Our data
doc/doxygen.cfg


+ 3
- 0
.gitmodules View File

@@ -0,0 +1,3 @@
[submodule "external"]
path = external
url = ../../lolengine/lol-external.git

+ 1
- 1
Makefile.am View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/build/autotools/common.am

# Put "people" at the end because they're more likely to break builds.
SUBDIRS = build src tools demos games doc people
SUBDIRS = build src tools doc
DIST_SUBDIRS = $(SUBDIRS) binaries

EXTRA_DIST += bootstrap COPYING TODO


+ 3
- 0
bootstrap View File

@@ -20,6 +20,9 @@ set -e
sed -ne '/AC_CONFIG_FILES/,$p' configure.ac \
| sed -ne 's@[^a-z]*\(.*/.*\)[^a-z]*@\1@p' | while read p; do
case "$p" in
"")
continue
;;
*Makefile)
required="${p}.am"
;;


+ 4
- 68
configure.ac View File

@@ -470,12 +470,6 @@ AC_CONFIG_FILES(
src/t/Makefile
build/Makefile
binaries/Makefile
people/Makefile
games/Makefile
demos/Makefile
tools/Makefile
tools/vimlol/Makefile
tools/vslol/Makefile
doc/Makefile
doc/doxygen.cfg
doc/samples/Makefile
@@ -483,69 +477,11 @@ AC_CONFIG_FILES(
doc/samples/meshviewer/Makefile
doc/samples/sandbox/Makefile
doc/tutorial/Makefile
])
AC_CONFIG_FILES(
[games/monsterz/Makefile
games/mrpigeon/Makefile
games/orbital/Makefile
games/singlshot/Makefile
games/thonik/Makefile
games/sot3000/Makefile
games/grunx/Makefile
games/weshgrow/Makefile
games/allturdbeast/Makefile
])
AC_CONFIG_FILES(
[games/deushax/Makefile
games/deushax/art/Makefile
games/deushax/art/test/Makefile
games/deushax/gfx/Makefile
games/deushax/maps/Makefile
])
AC_CONFIG_FILES(
[games/abuse/Makefile
games/abuse/src/Makefile
games/abuse/data/Makefile
games/abuse/doc/Makefile
games/abuse/doc/abuse.6
games/abuse/doc/abuse-tool.6
])
AC_CONFIG_FILES(
[demos/lol.js/Makefile
])
AC_CONFIG_FILES(
[tools/lolremez/Makefile
tools/Makefile
tools/lolremez/Makefile
tools/lolunit/Makefile
tools/neercs/Makefile
tools/pimp/Makefile
tools/zepto8/Makefile
])
AC_CONFIG_FILES(
[people/jnat/Makefile
people/jnat/TestProject/Makefile
people/peeweek/Makefile
people/benlitz/Makefile
people/benlitz/test1/Makefile
people/benlitz/voxel/Makefile
people/benlitz/lolui/Makefile
people/touky/Makefile
people/touky/shared/Makefile
people/touky/sprite_sorter/Makefile
people/touky/squad_shooter/Makefile
people/touky/top_shooter/Makefile
people/touky/touky_demo/Makefile
people/touky/tactics/Makefile
people/touky/the_unfortunate_voronoid/Makefile
people/touky/workbench/Makefile
people/jylam/Makefile
people/jylam/private/Makefile
people/jylam/private/chat/Makefile
people/jylam/private/lander/Makefile
people/jylam/private/oric_convert/Makefile
people/sam/Makefile
people/sam/kanagawa/Makefile
people/sam/ld36/Makefile
people/sam/sapp/Makefile
tools/vimlol/Makefile
tools/vslol/Makefile
])

AC_OUTPUT


+ 1
- 0
external

@@ -0,0 +1 @@
Subproject commit 88ebbc99e2ed7e9f93b8e336dce7b1e08a776551

+ 0
- 3
tools/Makefile.am View File

@@ -4,11 +4,8 @@ include $(top_srcdir)/build/autotools/common.am
SUBDIRS =
SUBDIRS += lolremez
SUBDIRS += lolunit
SUBDIRS += neercs
SUBDIRS += pimp
SUBDIRS += vimlol
SUBDIRS += vslol
SUBDIRS += zepto8

noinst_PROGRAMS = $(make_font)



Loading…
Cancel
Save