From: Grazvydas Ignotas Date: Sat, 10 Aug 2013 13:50:43 +0000 (+0300) Subject: fix warnings and deps X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5b2956d446d8d153b70f3df9ebb08554b2a8d1f;p=cyclone68000.git fix warnings and deps also change how CONFIG_FILE is specified (should not be quoted) --- diff --git a/Disa/Disa.c b/Disa/Disa.c index 562929b..259fcfa 100644 --- a/Disa/Disa.c +++ b/Disa/Disa.c @@ -743,10 +743,9 @@ static int DisaCmpEor(int op) static int DisaCmpm(int op) { // Cmpm 1011ddd1 xx001sss - int type=0,size=0,dea=0,sea=0; + int size=0,dea=0,sea=0; char deat[64]="",seat[64]=""; - type=(op>>12)&5; dea =(op>> 9)&7; dea|=8; size=(op>> 6)&3; if (size>=3) return 1; sea = op&0x3f; diff --git a/Ea.cpp b/Ea.cpp index 77c282b..606e8f4 100644 --- a/Ea.cpp +++ b/Ea.cpp @@ -141,10 +141,8 @@ static int EaCalcReg(int r,int ea,int mask,int forceor,int shift,int noshift=0) int EaCalc(int a,int mask,int ea,int size,int top,int sign_extend) { char text[32]=""; - int func=0; DisaPc=2; DisaGetEa(text,ea,size); // Get text version of the effective address - func=0x68+(size<<2); // Get correct read handler if (ea<0x10) { diff --git a/Makefile b/Makefile index 703cf35..8b7a5fd 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ CFLAGS += -Wall -ggdb ifdef CONFIG_FILE -CFLAGS += -DCONFIG_FILE=$(CONFIG_FILE) +CFLAGS += -DCONFIG_FILE="\"$(CONFIG_FILE)\"" endif CXXFLAGS += $(CFLAGS) @@ -16,3 +16,8 @@ cyclone_gen: $(OBJS) clean: $(RM) $(OBJS) cyclone_gen Cyclone.s + +$(OBJS): app.h config.h Cyclone.h +ifdef CONFIG_FILE +$(OBJS): $(CONFIG_FILE) +endif