From 06e9e7d310e8f7a037dc1c7c622525a18e15cb52 Mon Sep 17 00:00:00 2001 From: wawa Date: Sat, 19 Aug 2017 19:34:46 +0000 Subject: [PATCH] reverting rubbish that has slipped in with the last commit. sorry again. i'm leaving the new mkisofs fetch location though, as this is valid. git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@54891 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- DiskSpeed/diskspeed/DiskSpeed.c | 2 -- FryingPan/framework/Generic/Debug.h | 2 +- vpdf/mmakefile.src | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/DiskSpeed/diskspeed/DiskSpeed.c b/DiskSpeed/diskspeed/DiskSpeed.c index 0c7c1b85b..67e22811f 100644 --- a/DiskSpeed/diskspeed/DiskSpeed.c +++ b/DiskSpeed/diskspeed/DiskSpeed.c @@ -1352,8 +1352,6 @@ static VOID SetVersionStrings(struct DiskSpeed *global) #if defined(__PPC__) strcpy( global->CPU_Type,"PPC" ); -#elseif defined(__m68k__) - strcpy( global->CPU_Type,"m68k" ); #else strcpy( global->CPU_Type,"i386" ); #endif diff --git a/FryingPan/framework/Generic/Debug.h b/FryingPan/framework/Generic/Debug.h index 3a9b0f436..358af9ab3 100644 --- a/FryingPan/framework/Generic/Debug.h +++ b/FryingPan/framework/Generic/Debug.h @@ -150,7 +150,7 @@ namespace GenNS static bool CleanUp(void); }; }; -#define DEBUG + #if defined( DEBUG ) #define _D(l, a, b...) __dbg->DoAsync(l, a, SIZEARRAY(b), 0, 0) #define _DD(a,b) __dbg->DoAsync(Lvl_Dump, 0, 0, a, b) diff --git a/vpdf/mmakefile.src b/vpdf/mmakefile.src index d4d3f8ee8..a6bd47239 100644 --- a/vpdf/mmakefile.src +++ b/vpdf/mmakefile.src @@ -41,8 +41,8 @@ TARGETDIR := $(AROS_CONTRIB)/Utilities/Text/VPDF USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/poppler/poppler -I$(SRCDIR)/$(CURDIR)/poppler -I$(SRCDIR)/$(CURDIR)/system \ -I$(SRCDIR)/$(CURDIR)/aros/include -I$(AROS_INCLUDES)/cairo -idirafter $(SRCDIR)/$(CURDIR)/include NOWARN_FLAGS := $(NOWARN_UNUSED_VARIABLE) $(NOWARN_CPP) $(NOWARN_UNUSED_FUNCTION) $(NOWARN_MISSING_BRACES) $(NOWARN_UNINITIALIZED) $(NOWARN_WRITE_STRINGS) $(NOWARN_SIGN_COMPARE) -USER_CFLAGS := -O0 $(NOWARN_FLAGS) -O0 -D__LOCALE_STDLIBBASE__ -D__TIMER_STDLIBBASE__ -DMUI_OBSOLETE -USER_CXXFLAGS := -O0 $(NOWARN_FLAGS) -frtti $(CFLAGS_PERMISSIVE) $(CFLAGS_EXCEPTIONS) -fcheck-new +USER_CFLAGS := $(NOWARN_FLAGS) -O0 -D__LOCALE_STDLIBBASE__ -D__TIMER_STDLIBBASE__ -DMUI_OBSOLETE +USER_CXXFLAGS := $(NOWARN_FLAGS) -frtti $(CFLAGS_PERMISSIVE) $(CFLAGS_EXCEPTIONS) -fcheck-new USER_LDFLAGS := -L$(TARGETDIR)/libs -L$(AROS_CONTRIB_LIB) -static-libstdc++ %build_prog mmake=contrib-vpdf progname=VPDF files=$(CFILES) cxxfiles=$(CPPFILES) \ -- 2.11.4.GIT