summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile88
1 files changed, 34 insertions, 54 deletions
diff --git a/Makefile b/Makefile
index fa8a6c834..c9e906179 100644
--- a/Makefile
+++ b/Makefile
@@ -289,10 +289,12 @@ else
endif
else
ifeq ($(TARGET),kolibrios)
- CC := kos32-gcc
- LD := kos32-ld
- PKG_CONFIG := pkg-config
- PREFIX := /opt/netsurf
+ CROSSDIR := /opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
+ ENVDIR := /opt/netsurf/kos32-gcc/env/
+ CC := $(CROSSDIR)/kos32-gcc
+ LD := $(CROSSDIR)/kos32-ld
+ PREFIX := /opt/netsurf/kos32-gcc/env
+ PKG_CONFIG := PKG_CONFIG_PATH=$(ENVDIR)/lib/pkgconfig pkg-config
else
# All native targets
@@ -515,32 +517,19 @@ CWARNFLAGS := -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
include Makefile.defaults
# libraries enabled by feature switch without pkgconfig file
+$(eval $(call feature_switch,JPEG,JPEG (libjpeg),-DWITH_JPEG,-ljpeg,-UWITH_JPEG,))
+$(eval $(call feature_switch,HARU_PDF,PDF export (haru),-DWITH_PDF_EXPORT,-lhpdf -lpng,-UWITH_PDF_EXPORT,))
+$(eval $(call feature_switch,LIBICONV_PLUG,glibc internal iconv,-DLIBICONV_PLUG,,-ULIBICONV_PLUG,-liconv))
+$(eval $(call feature_switch,DUKTAPE,Javascript (Duktape),,,,,))
# Common libraries with pkgconfig
-ifneq ($(TARGET),kolibrios)
- $(eval $(call feature_switch,JPEG,JPEG (libjpeg),-DWITH_JPEG,-ljpeg,-UWITH_JPEG,))
- $(eval $(call feature_switch,HARU_PDF,PDF export (haru),-DWITH_PDF_EXPORT,-lhpdf -lpng,-UWITH_PDF_EXPORT,))
- $(eval $(call feature_switch,LIBICONV_PLUG,glibc internal iconv,-DLIBICONV_PLUG,,-ULIBICONV_PLUG,-liconv))
- $(eval $(call feature_switch,DUKTAPE,Javascript (Duktape),,,,,))
- $(eval $(call pkg_config_find_and_add,libcss,CSS))
- $(eval $(call pkg_config_find_and_add,libdom,DOM))
- $(eval $(call pkg_config_find_and_add,libnsutils,nsutils))
- $(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc))
-else
- KOL_LIBC := $(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include/
- KOL_LIB_DIR := $(HOME)/kolibrios/contrib/sdk/lib
- LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype -lpng16 -ljpeg
- OS_LDFLAGS := -static -S -Tapp-dynamic.lds --image-base 0 -Map netsurf-kolibrios.map
-
- NS_INCLUDE := $(PREFIX)/include
- NS_LIB_LDFLAGS := -L$(PREFIX)/lib/ -lnsbmp -lnsutils -lwapcaplet -lsvgtiny -lnsgif -lutf8proc -lcss -lnsfb -lparserutils -ldom -lhubbub -lz
-
- CFLAGS += -c -fno-ident -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -U__BSD_VISIBLE -I$(KOL_LIBC) -I$(NS_INCLUDE)
- LDFLAGS += $(OS_LDFLAGS) $(NS_LIB_LDFLAGS) $(LIB_LDFLAGS) -lgcc -lc.dll
-endif
+$(eval $(call pkg_config_find_and_add,libcss,CSS))
+$(eval $(call pkg_config_find_and_add,libdom,DOM))
+$(eval $(call pkg_config_find_and_add,libnsutils,nsutils))
+$(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc))
-# Common libraries without pkg-config support
ifneq ($(TARGET),kolibrios)
+ # Common libraries without pkg-config support
LDFLAGS += -lz
endif
@@ -561,22 +550,20 @@ NETSURF_FEATURE_NSPSL_CFLAGS := -DWITH_NSPSL
# resolved by the subsequent openssl
# freemint does not support pkg-config for libcurl
-ifneq ($(TARGET),kolibrios)
- ifeq ($(HOST),mint)
- CFLAGS += $(shell curl-config --cflags)
- LDFLAGS += $(shell curl-config --libs)
- else
- $(eval $(call pkg_config_find_and_add_enabled,CURL,libcurl,Curl))
- endif
- $(eval $(call pkg_config_find_and_add_enabled,OPENSSL,openssl,OpenSSL))
-
- $(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG))
- $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP))
- $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF))
- $(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG))
- $(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite))
- $(eval $(call pkg_config_find_and_add_enabled,NSPSL,libnspsl,PSL))
+ifeq ($(HOST),mint)
+ CFLAGS += $(shell curl-config --cflags)
+ LDFLAGS += $(shell curl-config --libs)
+else
+ $(eval $(call pkg_config_find_and_add_enabled,CURL,libcurl,Curl))
endif
+$(eval $(call pkg_config_find_and_add_enabled,OPENSSL,openssl,OpenSSL))
+
+$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG))
+$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP))
+$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF))
+$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG))
+$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite))
+$(eval $(call pkg_config_find_and_add_enabled,NSPSL,libnspsl,PSL))
# List of directories in which headers are searched for
INCLUDE_DIRS :=. include $(OBJROOT)
@@ -604,7 +591,7 @@ $(DEPROOT)/created: $(OBJROOT)/created
$(Q)$(TOUCH) $(DEPROOT)/created
$(TOOLROOT)/created: $(OBJROOT)/created
- $(VQ)echo "MKDIR: $(TOOLROOT)"
+ $(VQ)echo " MKDIR: $(TOOLROOT)"
$(Q)$(MKDIR) -p $(TOOLROOT)
$(Q)$(TOUCH) $(TOOLROOT)/created
@@ -700,18 +687,16 @@ OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsu
# Include directory flags
IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
-ifeq ($(TARGET),kolibrios)
- KOLOBJECTS = $(HOME)/kolibrios/programs/fs/unzip60/kolibri/dirent.o $(HOME)/NETSURFLIBS/netsurf/frontends/kolibrios/asmobj/loadhttp.obj $(HOME)/kolibrios/programs/develop/libraries/iconv/iconv.o
-endif
-
$(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES)
$(VQ)echo " LINK: $(EXETARGET)"
-ifeq ($(TARGET),kolibrios)
+ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
+ ifeq ($(TARGET),kolibrios)
$(warning $(LD) -o $(EXETARGET) $(OBJECTS) $(KOLOBJECTS) $(LDFLAGS))
$(Q)$(LD) -o $(EXETARGET) $(OBJECTS) $(KOLOBJECTS) $(LDFLAGS)
objcopy -O binary nskolibrios
-else ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
+ else
$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS)
+ endif
else
$(Q)$(CXX) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS)
$(Q)$(ELF2AIF) $(EXETARGET:,ff8=,e1f) $(EXETARGET)
@@ -803,9 +788,6 @@ $$(DEPROOT)/$(3) $$(OBJROOT)/$(2): $$(OBJROOT)/created
$$(VQ)echo " COMPILE: $(1)"
$$(Q)$$(RM) $$(DEPROOT)/$(3)
$$(Q)$$(RM) $$(OBJROOT)/$(2)
-# $$(VQ)echo "$$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS) $(CFLAGS_ENV) \
- -MMD -MT '$$(DEPROOT)/$(3) $$(OBJROOT)/$(2)' \
- -MF $$(DEPROOT)/$(3) -o $$(OBJROOT)/$(2) -c $(1)"
$$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS) $(CFLAGS_ENV) \
-MMD -MT '$$(DEPROOT)/$(3) $$(OBJROOT)/$(2)' \
-MF $$(DEPROOT)/$(3) -o $$(OBJROOT)/$(2) -c $(1)
@@ -876,11 +858,9 @@ $(eval $(foreach SOURCE,$(filter %.s,$(SOURCES)), \
# ----------------------------------------------------------------------------
# Test setup
# ----------------------------------------------------------------------------
-
ifneq ($(TARGET),kolibrios)
- include test/Makefile
+ include test/Makefile
endif
-
# ----------------------------------------------------------------------------
# Clean setup
# ----------------------------------------------------------------------------
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-18 20:35:05 +0000