Everything compiles. Some kludges left regarding version and pversion. Now to get it to link...
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1037 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
parent
b3f2deedac
commit
93efc7e9e9
6
Makefile
6
Makefile
@ -184,12 +184,14 @@ else
|
|||||||
RMDIR= delete
|
RMDIR= delete
|
||||||
CP = copy
|
CP = copy
|
||||||
BIN = grafx2
|
BIN = grafx2
|
||||||
COPT = -c99 -Ivbcc:PosixLib/include -D__amigaos__
|
COPT = -c99 -Ivbcc:PosixLib/include -D__amigaos__ $(TTFCOPT)
|
||||||
CC = vc
|
CC = vc
|
||||||
OBJDIR = obj/amiga-vbcc
|
OBJDIR = obj/amiga-vbcc
|
||||||
ZIP = lha
|
ZIP = lha
|
||||||
ZIPOPT = a
|
ZIPOPT = a
|
||||||
|
|
||||||
|
NOTTF = 1
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
# Finally, the default rules that work fine for most unix/gcc systems, linux and freebsd are tested.
|
# Finally, the default rules that work fine for most unix/gcc systems, linux and freebsd are tested.
|
||||||
@ -260,7 +262,9 @@ else
|
|||||||
JOYCOPT =
|
JOYCOPT =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq ($(PLATFORM),amiga-vbcc)
|
||||||
COPT += -DSVN_revision='"$(shell svnversion .)"' -DProgram_version='"$(LABEL)"'
|
COPT += -DSVN_revision='"$(shell svnversion .)"' -DProgram_version='"$(LABEL)"'
|
||||||
|
endif
|
||||||
|
|
||||||
### And now for the real build rules ###
|
### And now for the real build rules ###
|
||||||
|
|
||||||
|
|||||||
@ -21,6 +21,11 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include "hotkeys.h"
|
#include "hotkeys.h"
|
||||||
|
|
||||||
|
#ifdef __VBCC__
|
||||||
|
#define false 0
|
||||||
|
#define true 1
|
||||||
|
#endif
|
||||||
|
|
||||||
T_Key_config ConfigKey[NB_SHORTCUTS] = {
|
T_Key_config ConfigKey[NB_SHORTCUTS] = {
|
||||||
{0,
|
{0,
|
||||||
"Scroll up",
|
"Scroll up",
|
||||||
|
|||||||
4
input.c
4
input.c
@ -28,6 +28,10 @@
|
|||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
|
||||||
|
#ifdef __VBCC__
|
||||||
|
#define __attribute__(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
void Handle_window_resize(SDL_ResizeEvent event);
|
void Handle_window_resize(SDL_ResizeEvent event);
|
||||||
void Handle_window_exit(SDL_QuitEvent event);
|
void Handle_window_exit(SDL_QuitEvent event);
|
||||||
|
|
||||||
|
|||||||
@ -32,6 +32,10 @@
|
|||||||
#define ZOOMX 2
|
#define ZOOMX 2
|
||||||
#define ZOOMY 2
|
#define ZOOMY 2
|
||||||
|
|
||||||
|
#ifdef __VBCC__
|
||||||
|
#define __attribute__(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
void Pixel_double (word x,word y,byte color)
|
void Pixel_double (word x,word y,byte color)
|
||||||
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
||||||
{
|
{
|
||||||
|
|||||||
4
pxquad.c
4
pxquad.c
@ -31,6 +31,10 @@
|
|||||||
#define ZOOMX 4
|
#define ZOOMX 4
|
||||||
#define ZOOMY 4
|
#define ZOOMY 4
|
||||||
|
|
||||||
|
#ifdef __VBCC__
|
||||||
|
#define __attribute__(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
void Pixel_quad (word x,word y,byte color)
|
void Pixel_quad (word x,word y,byte color)
|
||||||
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
||||||
{
|
{
|
||||||
|
|||||||
@ -28,6 +28,10 @@
|
|||||||
#include "graph.h"
|
#include "graph.h"
|
||||||
#include "pxsimple.h"
|
#include "pxsimple.h"
|
||||||
|
|
||||||
|
#ifdef __VBCC__
|
||||||
|
#define __attribute__(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
void Pixel_simple (word x,word y,byte color)
|
void Pixel_simple (word x,word y,byte color)
|
||||||
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
||||||
{
|
{
|
||||||
|
|||||||
4
pxtall.c
4
pxtall.c
@ -32,6 +32,10 @@
|
|||||||
#define ZOOMX 1
|
#define ZOOMX 1
|
||||||
#define ZOOMY 2
|
#define ZOOMY 2
|
||||||
|
|
||||||
|
#ifdef __VBCC__
|
||||||
|
#define __attribute__(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
void Pixel_tall (word x,word y,byte color)
|
void Pixel_tall (word x,word y,byte color)
|
||||||
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
||||||
{
|
{
|
||||||
|
|||||||
@ -31,6 +31,10 @@
|
|||||||
#define ZOOMX 2
|
#define ZOOMX 2
|
||||||
#define ZOOMY 4
|
#define ZOOMY 4
|
||||||
|
|
||||||
|
#ifdef __VBCC__
|
||||||
|
#define __attribute__(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
void Pixel_tall2 (word x,word y,byte color)
|
void Pixel_tall2 (word x,word y,byte color)
|
||||||
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
||||||
{
|
{
|
||||||
|
|||||||
@ -31,6 +31,10 @@
|
|||||||
#define ZOOMX 3
|
#define ZOOMX 3
|
||||||
#define ZOOMY 3
|
#define ZOOMY 3
|
||||||
|
|
||||||
|
#ifdef __VBCC__
|
||||||
|
#define __attribute__(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
void Pixel_triple (word x,word y,byte color)
|
void Pixel_triple (word x,word y,byte color)
|
||||||
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
||||||
{
|
{
|
||||||
|
|||||||
4
pxwide.c
4
pxwide.c
@ -31,6 +31,10 @@
|
|||||||
#define ZOOMX 2
|
#define ZOOMX 2
|
||||||
#define ZOOMY 1
|
#define ZOOMY 1
|
||||||
|
|
||||||
|
#ifdef __VBCC__
|
||||||
|
#define __attribute__(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
void Pixel_wide (word x,word y,byte color)
|
void Pixel_wide (word x,word y,byte color)
|
||||||
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
||||||
{
|
{
|
||||||
|
|||||||
@ -31,6 +31,10 @@
|
|||||||
#define ZOOMX 4
|
#define ZOOMX 4
|
||||||
#define ZOOMY 2
|
#define ZOOMY 2
|
||||||
|
|
||||||
|
#ifdef __VBCC__
|
||||||
|
#define __attribute__(w)
|
||||||
|
#endif
|
||||||
|
|
||||||
void Pixel_wide2 (word x,word y,byte color)
|
void Pixel_wide2 (word x,word y,byte color)
|
||||||
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
/* Affiche un pixel de la color aux coords x;y à l'écran */
|
||||||
{
|
{
|
||||||
|
|||||||
2
setup.c
2
setup.c
@ -49,7 +49,7 @@ int Create_ConfigDirectory(char * config_dir)
|
|||||||
#endif
|
#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))
|
#define ARG_UNUSED __attribute__((unused))
|
||||||
#else
|
#else
|
||||||
#define ARG_UNUSED
|
#define ARG_UNUSED
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user