Просмотр исходного кода

Use libtool to build our libraries. It’s really more convenient.

wip/kinc
Sam Hocevar 5 лет назад
Родитель
Сommit
b24a2f005e
4 измененных файлов: 12 добавлений и 12 удалений
  1. +2
    -3
      build/autotools/m4/lol-conf.m4
  2. +2
    -2
      build/lol-build
  3. +3
    -3
      src/3rdparty/Makefile.am
  4. +5
    -4
      src/Makefile.am

+ 2
- 3
build/autotools/m4/lol-conf.m4 Просмотреть файл

@@ -250,15 +250,14 @@ AC_DEFUN([LOL_AC_FINI], [
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} \$(lol_builddir)/src/liblol-core.a"
LOL_LUA_DEPS="${LOL_LUA_DEPS} \$(lol_builddir)/src/3rdparty/liblol-lua.a"
LOL_DEPS="${LOL_DEPS} \$(lol_builddir)/src/liblol-core.la"
LOL_LUA_DEPS="${LOL_LUA_DEPS} \$(lol_builddir)/src/3rdparty/liblol-lua.la"

dnl How to use the Lol Engine inside this tree
AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(lol_srcdir)/lol/include"
AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(lol_srcdir)/src"
AM_CPPFLAGS="${AM_CPPFLAGS} -DLOL_CONFIG_SOURCESUBDIR=\\\"\$(subdir)\\\""
AM_CPPFLAGS="${AM_CPPFLAGS} ${LOL_CFLAGS}"
AM_LDFLAGS="${AM_LDFLAGS} ${LOL_DEPS}"
AM_LDFLAGS="${AM_LDFLAGS} ${LOL_LIBS}"

dnl Extra flags


+ 2
- 2
build/lol-build Просмотреть файл

@@ -287,8 +287,8 @@ build()
win*-i386)
# Because of locking issues in Wine’s winepath.exe, we only
# build the static libraries in parallel.
make -j$LOL_PARALLEL -C src/3rdparty liblol-lua.a
make -j$LOL_PARALLEL -C src/ liblol-core.a
make -j$LOL_PARALLEL -C src/3rdparty liblol-lua.la
make -j$LOL_PARALLEL -C src liblol-core.la
make
;;
*)


+ 3
- 3
src/3rdparty/Makefile.am Просмотреть файл

@@ -1,15 +1,15 @@

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

noinst_LIBRARIES = liblol-lua.a
noinst_LTLIBRARIES = liblol-lua.la

# Only remove flags that were actually set, because we don't know
# what the compiler actually accepts.
disable_cflags_lua = $(filter $(AM_CPPFLAGS:-W%=-Wno-%), \
-Wno-cast-qual)

liblol_lua_a_SOURCES = $(lua_sources)
liblol_lua_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_ANSI $(disable_cflags_lua)
liblol_lua_la_SOURCES = $(lua_sources)
liblol_lua_la_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_ANSI $(disable_cflags_lua)

include lol-lua.am



+ 5
- 4
src/Makefile.am Просмотреть файл

@@ -1,13 +1,14 @@

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

SUBDIRS = 3rdparty data . t
SUBDIRS = . 3rdparty data t

noinst_LIBRARIES = liblol-core.a
# Convenience library; needs to be marked noinst
noinst_LTLIBRARIES = liblol-core.la

EXTRA_DIST += lol-core.vcxproj lol-core.vcxproj.filters

liblol_core_a_SOURCES = \
liblol_core_la_SOURCES = \
lolgl.h scene.cpp scene.h font.cpp font.h \
textureimage.cpp textureimage.h textureimage-private.h \
tileset.cpp tileset.h video.cpp video.h \
@@ -24,7 +25,7 @@ liblol_core_a_SOURCES = \
$(sdl_sources) \
$(d3d9_sources) \
$(android_sources)
liblol_core_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/3rdparty/lua/src
liblol_core_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/3rdparty/lua/src

liblol_core_headers = \
lol/engine-internal.h lol/engine.h lol/public.h lol/extras.h \


Загрузка…
Отмена
Сохранить