summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 10 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 81dd4c0..290d952 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Component settings
COMPONENT := pencil
-COMPONENT_VERSION := 0.0.3
+COMPONENT_VERSION := 0.0.5
# Default to a static library
COMPONENT_TYPE ?= lib-static
@@ -29,14 +29,6 @@ else
CFLAGS := $(CFLAGS) -Dinline="__inline__"
endif
-# OSLib
-ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
- ifeq ($(BUILD),arm-unknown-riscos)
- CFLAGS := $(CFLAGS) -I$(PREFIX)/include
- LDFLAGS := $(LDFLAGS) -lOSLib32
- endif
-endif
-
# RUfl
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
ifneq ($(PKGCONFIG),)
@@ -48,6 +40,15 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
endif
endif
+# OSLib
+ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
+ ifeq ($(findstring -riscos,$(HOST)),-riscos)
+ CFLAGS := $(CFLAGS) -I$(PREFIX)/include
+ LDFLAGS := $(LDFLAGS) -lOSLib32
+ TESTLDFLAGS := $(TESTLDFLAGS) -static
+ endif
+endif
+
include $(NSBUILD)/Makefile.top
# Extra installation rules