From d4560393b78630c87199cf7b8bf745322332a5eb Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sun, 17 May 2015 01:51:28 -0700 Subject: [PATCH] separate editor out to new miner-* targets --- .travis.yml | 2 -- Makefile.am | 27 +++++++++++++++++++++++---- configure.ac | 17 ++++++++++++----- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d603d28..97205a74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,7 @@ compiler: - x86_64-w64-mingw32-gcc env: - - CONFLAGS=" --enable-release --disable-debug --disable-editor --with-opengl" - CONFLAGS=" --enable-release --disable-debug --enable-editor --with-opengl" - - CONFLAGS="--disable-release --enable-debug --disable-editor --with-opengl" - CONFLAGS="--disable-release --enable-debug --enable-editor --with-opengl" before_install: diff --git a/Makefile.am b/Makefile.am index d48c1424..a03fb55e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ bin_PROGRAMS = @TARGETS@ hogcreate hogextract mveplayer mvlcreate mvlextract txb2tex tex2txb -EXTRA_PROGRAMS = d2x d2x-sdl d2x-gl d2x-svga +EXTRA_PROGRAMS = d2x d2x-sdl d2x-gl d2x-svga miner miner-sdl miner-gl miner-svga # Common to all d2x platforms/options @@ -57,8 +57,8 @@ if USE_NETWORK d2x_SOURCES += main/kmatrix.c main/multi.c main/multibot.c main/network.c main/netmisc.c endif -if USE_EDITOR -d2x_SOURCES += main/bmread.c main/dumpmine.c \ +_miner_CPPFLAGS = -DEDITOR +_miner_SOURCES = main/bmread.c main/dumpmine.c \ main/editor/autosave.c main/editor/centers.c main/editor/curves.c main/editor/eglobal.c \ main/editor/ehostage.c main/editor/elight.c main/editor/eobject.c main/editor/eswitch.c \ main/editor/fixseg.c main/editor/func.c main/editor/group.c main/editor/info.c \ @@ -73,7 +73,6 @@ ui/barbox.c ui/button.c ui/checkbox.c ui/file.c ui/gadget.c ui/ic ui/inputbox.c ui/keypad.c ui/keypress.c ui/keytrap.c ui/listbox.c ui/menu.c \ ui/menubar.c ui/message.c ui/mouse.c ui/number.c ui/popup.c ui/radio.c \ ui/scroll.c ui/ui.c ui/uidraw.c ui/userbox.c ui/window.c -endif if USE_LIBPNG d2x_SOURCES += misc/pngfile.c @@ -88,6 +87,11 @@ d2x_SOURCES += arch/dos/digi.c arch/dos/dpmi.c arch/dos/findfile.c arch/dos/vid. d2x_LDADD += arch/dos/timer.o arch/dos/modex.o endif +miner_CPPFLAGS = $(d2x_CPPFLAGS) $(_miner_CPPFLAGS) +miner_SOURCES = $(d2x_SOURCES) $(_miner_SOURCES) +miner_LDFLAGS = $(d2x_LDFLAGS) +miner_LDADD = $(d2x_LDADD) + # Remaining targets are based on d2x_* @@ -96,6 +100,11 @@ d2x_svga_SOURCES = $(d2x_SOURCES) arch/svgalib/event.c arch/svgalib/vid.c arch/s d2x_svga_LDFLAGS = $(d2x_LDFLAGS) d2x_svga_LDADD = $(d2x_LDADD) -lvga -lvgagl +miner_svga_CPPFLAGS = $(d2x_svga_CPPFLAGS) $(_miner_CPPFLAGS) +miner_svga_SOURCES = $(d2x_svga_SOURCES) $(_miner_SOURCES) +miner_svga_LDFLAGS = $(d2x_svga_LDFLAGS) +miner_svga_LDADD = $(d2x_svga_LDADD) + d2x_sdl_CPPFLAGS = $(d2x_CPPFLAGS) $(SDL_CFLAGS) $(SDLMIXER_CFLAGS) -I$(top_srcdir)/arch/linux/include _d2x_sdl_SOURCES = $(d2x_SOURCES) arch/sdl/event.c arch/sdl/key.c arch/sdl/mouse.c @@ -145,6 +154,11 @@ if MACOSX #d2x_sdl_LDFLAGS += -all_load endif +miner_sdl_CPPFLAGS = $(d2x_sdl_CPPFLAGS) $(_miner_CPPFLAGS) +miner_sdl_SOURCES = $(d2x_sdl_SOURCES) $(_miner_SOURCES) +miner_sdl_LDFLAGS = $(d2x_sdl_LDFLAGS) +miner_sdl_LDADD = $(d2x_sdl_LDADD) + # GL target is based on d2x_sdl_*, other than renderer @@ -165,6 +179,11 @@ d2x_gl_LDADD += -lGL -lGLU endif endif +miner_gl_CPPFLAGS = $(d2x_gl_CPPFLAGS) $(_miner_CPPFLAGS) +miner_gl_SOURCES = $(d2x_gl_SOURCES) $(_miner_SOURCES) +miner_gl_LDFLAGS = $(d2x_gl_LDFLAGS) +miner_gl_LDADD = $(d2x_gl_LDADD) + # Other programs diff --git a/configure.ac b/configure.ac index 355bdc03..01b8bf64 100644 --- a/configure.ac +++ b/configure.ac @@ -90,11 +90,6 @@ AX_CHECK_COMPILE_FLAG([-Wno-unused-but-set-variable], [CFLAGS="$CFLAGS -Wno-unus dnl Enable editor build? AC_ARG_ENABLE(editor, [ --enable-editor Build editor? (not functional)],,) -if test x$enable_editor = xyes; then - AC_DEFINE(EDITOR,,[Define if you want to build the editor]) - D2X_FEATURES="editor $D2X_FEATURES" -fi -AM_CONDITIONAL(USE_EDITOR, test x$enable_editor = xyes) dnl Enable macdata build? AC_ARG_ENABLE(macdata, @@ -167,6 +162,9 @@ TARGETS= # Test for MSDOS if test x$MSDOS = xyes; then TARGETS="d2x$ac_cv_exeext $TARGETS" + if test x$enable_editor = xyes; then + TARGETS="miner$ac_cv_exeext $TARGETS" + fi else CFLAGS="-pipe $CFLAGS" @@ -178,6 +176,9 @@ else ) TARGETS="d2x-sdl$ac_cv_exeext $TARGETS" + if test x$enable_editor = xyes; then + TARGETS="miner-sdl$ac_cv_exeext $TARGETS" + fi AC_CHECK_HEADERS(netipx/ipx.h) @@ -213,6 +214,9 @@ else [ --with-opengl Build OpenGL support ],,) if test x$with_opengl = xyes; then TARGETS="d2x-gl$ac_cv_exeext $TARGETS" + if test x$enable_editor = xyes; then + TARGETS="miner-gl$ac_cv_exeext $TARGETS" + fi fi # Check for SVGALib @@ -220,6 +224,9 @@ else [ --with-svga Build SVGALib support ],,) if test x$with_svga = xyes; then TARGETS="d2x-svga$ac_cv_exeext $TARGETS" + if test x$enable_editor = xyes; then + TARGETS="miner-svga$ac_cv_exeext $TARGETS" + fi fi AC_SUBST(SVGA_LIBS) AM_CONDITIONAL(USE_SVGALIB, test x$with_svga = xyes) -- 2.39.2