Allow to compile without RECOIL (make NORECOIL=1)
This commit is contained in:
@@ -522,6 +522,11 @@ else
|
||||
LUALABEL =
|
||||
endif
|
||||
|
||||
#Recoil is optional
|
||||
ifdef NORECOIL
|
||||
COPT += -DNORECOIL
|
||||
endif
|
||||
|
||||
#To enable Joystick emulation of cursor, make USE_JOYSTICK=1 (for input.o)
|
||||
#This can be necessary to test cursor code on a PC, but by default for all
|
||||
#non-console platforms the joystick is disabled, to avoid reporting
|
||||
@@ -547,7 +552,9 @@ OBJS = main.o init.o graph.o sdlscreen.o misc.o special.o \
|
||||
fileformats.o miscfileformats.o libraw2crtc.o \
|
||||
brush_ops.o buttons_effects.o layers.o \
|
||||
oldies.o tiles.o colorred.o unicode.o
|
||||
ifndef NORECOIL
|
||||
OBJS += loadrecoil.o recoil.o
|
||||
endif
|
||||
OBJ = $(addprefix $(OBJDIR)/,$(OBJS))
|
||||
|
||||
SKINS = skin_classic.png skin_modern.png skin_DPaint.png \
|
||||
|
||||
@@ -176,7 +176,9 @@ void Load_SDL_Image(T_IO_Context *);
|
||||
|
||||
// -- Recoil ----------------------------------------------------------------
|
||||
// 8bits and 16bits computer graphics
|
||||
#ifndef NORECOIL
|
||||
void Load_Recoil_Image(T_IO_Context *);
|
||||
#endif
|
||||
|
||||
// ENUM Name TestFunc LoadFunc SaveFunc PalOnly Comment Layers Ext Exts
|
||||
const T_Format File_formats[] = {
|
||||
@@ -666,8 +668,10 @@ void Load_image(T_IO_Context *context)
|
||||
{
|
||||
context->Format = DEFAULT_FILEFORMAT;
|
||||
// try with recoil
|
||||
#ifndef NORECOIL
|
||||
Load_Recoil_Image(context);
|
||||
if (File_error)
|
||||
#endif
|
||||
{
|
||||
// Last try: with SDL_image
|
||||
Load_SDL_Image(context);
|
||||
|
||||
Reference in New Issue
Block a user