From bb7e856929c6a4da1ac19832c0300466bb2dc508 Mon Sep 17 00:00:00 2001
From: Cameron Cawley <[EMAIL REDACTED]>
Date: Sat, 24 Sep 2022 14:50:24 +0100
Subject: [PATCH] Fix building for OS/2 under Windows
---
Makefile.os2 | 6 +++---
test/Makefile.os2 | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.os2 b/Makefile.os2
index a3f9d508..3f3fb1d7 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -8,7 +8,7 @@ DLLNAME = SDL12
VERSION = 1.2.16
LIBHOME = os2
-INCPATH = -I$(%WATCOM)/h/os2 -I$(%WATCOM)/h
+INCPATH = -I"$(%WATCOM)/h/os2" -I"$(%WATCOM)/h"
INCPATH+= -Iinclude -I"os2/h"
LIBPATH=$(LIBHOME)/lib
LIBNAME=$(DLLNAME)
@@ -105,8 +105,8 @@ $(LIBFILE): $(DLLFILE)
@echo * Creating LIB file: $@
wlib -q -b -n -c -pa -s -t -zld -ii -io $* $(DLLFILE)
-SDL_RLEaccel.obj:
- wcc386 $(CFLAGS) -w1 -fo=$^@ src/video/SDL_RLEaccel.c
+SDL_RLEaccel.obj: SDL_RLEaccel.c
+ wcc386 $(CFLAGS) -w1 -fo=$^@ $<
compiling_info : .symbolic
@echo * Compiling...
diff --git a/test/Makefile.os2 b/test/Makefile.os2
index cca89407..99b1e78d 100644
--- a/test/Makefile.os2
+++ b/test/Makefile.os2
@@ -11,7 +11,7 @@ OBJS = $(TARGETS:.exe=.obj)
all: $(TARGETS)
-INCPATH = -I$(%WATCOM)/h/os2 -I$(%WATCOM)/h -I../include
+INCPATH = -I"$(%WATCOM)/h/os2" -I"$(%WATCOM)/h" -I"../include"
CFLAGS_DEF = $(INCPATH) -bt=os2 -d0 -q -bm -5s -fp5 -fpi87 -sg -oteanbmier
CFLAGS_EXE = $(CFLAGS_DEF)
CFLAGS = $(CFLAGS_EXE) -ei -5s