From 632afcf3330743419eceb1ee7fe03f6cd5bdc2d4 Mon Sep 17 00:00:00 2001 From: steffen Date: Tue, 6 Jul 2021 20:52:00 +0000 Subject: [PATCH] update --- Makefile | 3 +-- android/Makefile | 2 +- base/memoryleak.h | 2 +- base/utf8.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9bde60e..4556506 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ sposmroutegl: do if ! make -C $$i; then \ exit -2; \ fi done - $(CC) -o sposmroute -lsdlgl -lm -lmain -lgui -lmain -lmapsys -ldraw -lsdlgl -lbase -lmain -Lbase -Lmain -Lsdlgl -Ldraw -Lgui -Lmapsys -lbz2 $(DEBUG) `sdl-config --libs` `pkg-config --libs freetype2 libpng` -lGL -lGLU -L/usr/X11R6/lib -L/usr/lib + $(CC) -o sposmroute -lsdlgl -lm -lmain -lgui -lmain -lmapsys -ldraw -lsdlgl -lbase -lmain -Lbase -Lmain -Lsdlgl -Ldraw -Lgui -Lmapsys -lbz2 $(DEBUG) `sdl-config --libs` `pkg-config --libs freetype2 libpng` -lm -lGL -lGLU -L/usr/X11R6/lib -L/usr/lib cleanapp: rm -rf sposmroutegl endif @@ -116,7 +116,6 @@ endif - help: echo "no configuration found yet, please run" echo " make configwin to configure windows version" diff --git a/android/Makefile b/android/Makefile index 2d23a6d..bf44654 100644 --- a/android/Makefile +++ b/android/Makefile @@ -1,6 +1,6 @@ app: - android update project -p . -s --target 9 -n sposmroute + android update project -p . -s --target 1 -n sposmroute ndk-build ant debug diff --git a/base/memoryleak.h b/base/memoryleak.h index 25e20b8..0c27f82 100644 --- a/base/memoryleak.h +++ b/base/memoryleak.h @@ -22,7 +22,7 @@ #if !defined(__MINGW32CE__) && !defined(_WIN32_WCE) #define ML_BT_SIZE 8 #define ML_BT_TEXT 100 - #define MEMORYLEAK_MAX 50000 + #define MEMORYLEAK_MAX 20000 #define MEMORYLEAK_MAXMEM 1500000000 #else #define ML_BT_SIZE 2 diff --git a/base/utf8.h b/base/utf8.h index 64064a6..76d64a7 100644 --- a/base/utf8.h +++ b/base/utf8.h @@ -1,4 +1,4 @@ -/* $Id: utf8.h,v 1.3 2013/06/09 20:11:30 steffen Exp $ */ +/* $Id: utf8.h,v 1.4 2021/07/06 20:52:00 steffen Exp $ */ /* utf8.h * Copyright (C) Steffen Pohle 2013 *