Skip to content

Commit

Permalink
Fix build against upstream tilibs git
Browse files Browse the repository at this point in the history
Added all pkgconfig checks for tifiles,cables, and conv
Adjusted tidump for the changed libticalcs internal header rename
    cmd73.h -> cmdz80.h

Signed-off-by: Jon Sturm <jonimoose@gmail.com>
  • Loading branch information
Jonimoose committed May 15, 2016
1 parent 262f0f4 commit d353be7
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 4 deletions.
6 changes: 6 additions & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ LIBS = @LIBS@

TICALCS_CFLAGS = @TICALCS_CFLAGS@
TICALCS_LIBS = @TICALCS_LIBS@
TICABLES_CFLAGS = @TICABLES_CFLAGS@
TICABLES_LIBS = @TICABLES_LIBS@
TIFILES_CFLAGS = @TIFILES_CFLAGS@
TIFILES_LIBS = @TIFILES_LIBS@
TICONV_CFLAGS = @TICONV_CFLAGS@
TICONV_LIBS = @TICONV_LIBS@

@SET_MAKE@
srcdir = @srcdir@
Expand Down
7 changes: 5 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ init_function=ticalcs_library_init
if test "x$TICALCS_LIBS" = "x" &&
test "x$use_calcprotocols" = "xno" ; then
PKG_CHECK_MODULES(TICALCS, ticalcs2, [ : ], [ : ])
PKG_CHECK_MODULES(TICABLES, ticables2, [ : ], [ : ])
PKG_CHECK_MODULES(TIFILES, tifiles2, [ : ], [ : ])
PKG_CHECK_MODULES(TICONV, ticonv, [ : ], [ : ])
fi

if test "x$TICALCS_LIBS" = "x" &&
Expand All @@ -53,8 +56,8 @@ fi

save_cflags="$CFLAGS"
save_libs="$LIBS"
CFLAGS="$CFLAGS $TICALCS_CFLAGS"
LIBS="$LIBS $TICALCS_LIBS"
CFLAGS="$CFLAGS $TICALCS_CFLAGS $TICABLES_CFLAGS $TIFILES_CFLAGS $TICONV_CFLAGS"
LIBS="$LIBS $TICALCS_LIBS $TICABLES_LIBS $TIFILES_LIBS $TICONV_LIBS"
AC_CHECK_FUNC($init_function,
[ have_ticalcs=yes ],
[ have_ticalcs=no ])
Expand Down
8 changes: 7 additions & 1 deletion src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ LIBS = @LIBS@

TICALCS_CFLAGS = @TICALCS_CFLAGS@
TICALCS_LIBS = @TICALCS_LIBS@
TICABLES_CFLAGS = @TICABLES_CFLAGS@
TICABLES_LIBS = @TICABLES_LIBS@
TIFILES_CFLAGS = @TIFILES_CFLAGS@
TIFILES_LIBS = @TIFILES_LIBS@
TICONV_CFLAGS = @TICONV_CFLAGS@
TICONV_LIBS = @TICONV_LIBS@

@SET_MAKE@
srcdir = @srcdir@
Expand All @@ -21,7 +27,7 @@ top_builddir = @top_builddir@

compile = $(CC) -I$(top_builddir) -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(TICALCS_CFLAGS) $(DEFS)
link = $(CC) $(CFLAGS) $(LDFLAGS)
libs = $(TICALCS_LIBS) $(LIBS)
libs = $(TICALCS_LIBS) $(TICABLES_LIBS) $(TIFILES_LIBS) $(TICONV_LIBS) $(LIBS)

programs = tiget@EXEEXT@ \
tiinfo@EXEEXT@ \
Expand Down
2 changes: 1 addition & 1 deletion src/tidump.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <string.h>
#include <stdlib.h>
#include "titools.h"
#include <cmd73.h>
#include <cmdz80.h>

#define PKTSIZE 0x400

Expand Down

0 comments on commit d353be7

Please sign in to comment.