From 6a225eb4ed75f148f2e26073608a7d5a89b5b689 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 23 Feb 2015 19:33:41 +0000 Subject: [PATCH] Fix Haiku build. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2087 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- src/Makefile | 3 +-- src/setup.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 31c213f7..a722f7bf 100644 --- a/src/Makefile +++ b/src/Makefile @@ -203,8 +203,7 @@ endif LOPT = $(shell sdl-config --libs) -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) -lfreetype -lbe $(LUALOPT) CC = gcc #Append the gcc kind to the objdir (gcc2 or gcc4) to avoid conflicts when switching from one to other. - OBJKIND = $(lastword $(shell setgcc)) - OBJDIR = ../obj/haiku/$(OBJKIND) + OBJDIR = ../obj/haiku ZIP = zip else diff --git a/src/setup.c b/src/setup.c index 67cb3140..315c61f7 100644 --- a/src/setup.c +++ b/src/setup.c @@ -43,6 +43,8 @@ #elif defined(__linux__) #include #include +#elif defined(__HAIKU__) + #include #endif #include "struct.h"