diff --git a/Makefile b/Makefile index 1174246d..318f5256 100644 --- a/Makefile +++ b/Makefile @@ -184,11 +184,13 @@ else RMDIR= delete CP = copy BIN = grafx2 - COPT = -c99 -Ivbcc:PosixLib/include -D__amigaos__ + COPT = -c99 -Ivbcc:PosixLib/include -D__amigaos__ $(TTFCOPT) CC = vc OBJDIR = obj/amiga-vbcc ZIP = lha - ZIPOPT= a + ZIPOPT = a + + NOTTF = 1 else @@ -260,7 +262,9 @@ else JOYCOPT = endif -COPT += -DSVN_revision='"$(shell svnversion .)"' -DProgram_version='"$(LABEL)"' +ifneq ($(PLATFORM),amiga-vbcc) + COPT += -DSVN_revision='"$(shell svnversion .)"' -DProgram_version='"$(LABEL)"' +endif ### And now for the real build rules ### diff --git a/hotkeys.c b/hotkeys.c index fba26f53..9c394d50 100644 --- a/hotkeys.c +++ b/hotkeys.c @@ -21,6 +21,11 @@ #include "global.h" #include "hotkeys.h" +#ifdef __VBCC__ + #define false 0 + #define true 1 +#endif + T_Key_config ConfigKey[NB_SHORTCUTS] = { {0, "Scroll up", diff --git a/input.c b/input.c index f5cb582d..c6f87c43 100644 --- a/input.c +++ b/input.c @@ -28,6 +28,10 @@ #include "misc.h" #include "input.h" +#ifdef __VBCC__ + #define __attribute__(x) +#endif + void Handle_window_resize(SDL_ResizeEvent event); void Handle_window_exit(SDL_QuitEvent event); diff --git a/pxdouble.c b/pxdouble.c index c4f4fd3a..a0758684 100644 --- a/pxdouble.c +++ b/pxdouble.c @@ -32,6 +32,10 @@ #define ZOOMX 2 #define ZOOMY 2 +#ifdef __VBCC__ + #define __attribute__(x) +#endif + void Pixel_double (word x,word y,byte color) /* Affiche un pixel de la color aux coords x;y à l'écran */ { diff --git a/pxquad.c b/pxquad.c index 1b1e328f..d7bb35f2 100644 --- a/pxquad.c +++ b/pxquad.c @@ -31,6 +31,10 @@ #define ZOOMX 4 #define ZOOMY 4 +#ifdef __VBCC__ + #define __attribute__(x) +#endif + void Pixel_quad (word x,word y,byte color) /* Affiche un pixel de la color aux coords x;y à l'écran */ { diff --git a/pxsimple.c b/pxsimple.c index f7bfdebb..a9290da7 100644 --- a/pxsimple.c +++ b/pxsimple.c @@ -28,6 +28,10 @@ #include "graph.h" #include "pxsimple.h" +#ifdef __VBCC__ + #define __attribute__(x) +#endif + void Pixel_simple (word x,word y,byte color) /* Affiche un pixel de la color aux coords x;y à l'écran */ { diff --git a/pxtall.c b/pxtall.c index c63df96d..71d923b7 100644 --- a/pxtall.c +++ b/pxtall.c @@ -32,6 +32,10 @@ #define ZOOMX 1 #define ZOOMY 2 +#ifdef __VBCC__ + #define __attribute__(x) +#endif + void Pixel_tall (word x,word y,byte color) /* Affiche un pixel de la color aux coords x;y à l'écran */ { diff --git a/pxtall2.c b/pxtall2.c index ca4b1b0d..4393feee 100644 --- a/pxtall2.c +++ b/pxtall2.c @@ -31,6 +31,10 @@ #define ZOOMX 2 #define ZOOMY 4 +#ifdef __VBCC__ + #define __attribute__(x) +#endif + void Pixel_tall2 (word x,word y,byte color) /* Affiche un pixel de la color aux coords x;y à l'écran */ { diff --git a/pxtriple.c b/pxtriple.c index 99f58efd..fc299cfb 100644 --- a/pxtriple.c +++ b/pxtriple.c @@ -31,6 +31,10 @@ #define ZOOMX 3 #define ZOOMY 3 +#ifdef __VBCC__ + #define __attribute__(x) +#endif + void Pixel_triple (word x,word y,byte color) /* Affiche un pixel de la color aux coords x;y à l'écran */ { diff --git a/pxwide.c b/pxwide.c index f0d60074..2656dd25 100644 --- a/pxwide.c +++ b/pxwide.c @@ -31,6 +31,10 @@ #define ZOOMX 2 #define ZOOMY 1 +#ifdef __VBCC__ + #define __attribute__(x) +#endif + void Pixel_wide (word x,word y,byte color) /* Affiche un pixel de la color aux coords x;y à l'écran */ { diff --git a/pxwide2.c b/pxwide2.c index d0d2f400..498756be 100644 --- a/pxwide2.c +++ b/pxwide2.c @@ -31,6 +31,10 @@ #define ZOOMX 4 #define ZOOMY 2 +#ifdef __VBCC__ + #define __attribute__(w) +#endif + void Pixel_wide2 (word x,word y,byte color) /* Affiche un pixel de la color aux coords x;y à l'écran */ { diff --git a/setup.c b/setup.c index 4e259390..548af219 100644 --- a/setup.c +++ b/setup.c @@ -49,7 +49,7 @@ int Create_ConfigDirectory(char * config_dir) #endif } -#if defined(__macosx__) || defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) +#if defined(__macosx__) || defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) && !defined(__VBCC__) #define ARG_UNUSED __attribute__((unused)) #else #define ARG_UNUSED