mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 12:36:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

change to use netsurf toolchain build

Browse Source
This commit is contained in:
Vincent Sanders 2012-07-23 21:12:19 +01:00
parent 8a6f63fca3
commit 3faaff91ac
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -207,12 +207,13 @@ else
ifeq ($(TARGET),windows) ifeq ($(TARGET),windows)
ifneq ($(HOST),windows) ifneq ($(HOST),windows)
# Set Mingw defaults # Set Mingw defaults
MINGW_PREFIX ?= i586-mingw32msvc- GCCSDK_INSTALL_ENV ?= /opt/netsurf/i686-w64-mingw32/env
MINGW_INSTALL_ENV ?= /usr/i586-mingw32msvc/ GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/i686-w64-mingw32/cross/bin
# mingw cross-compile CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
CC := $(MINGW_PREFIX)gcc WINDRES := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*windres)
PKG_CONFIG := $(MINGW_INSTALL_ENV)/bin/pkg-config
PKG_CONFIG := PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig" pkg-config
else else
# Building on Windows # Building on Windows
CC := gcc CC := gcc

15
windows/Makefile.target
View File

@ -2,7 +2,8 @@
# Windows target setup # Windows target setup
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
LDFLAGS += -L${MINGW_INSTALL_ENV}/lib LDFLAGS += -L${GCCSDK_INSTALL_ENV}/lib
CFLAGS += -I${GCCSDK_INSTALL_ENV}/include/
NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG
NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
@ -17,9 +18,9 @@
ifneq ($(PKG_CONFIG),) ifneq ($(PKG_CONFIG),)
CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl libhubbub zlib \ CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl libhubbub zlib \
libparserutils libxml-2.0) libparserutils libdom libwapcaplet libcares libxml-2.0)
LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcurl \ LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcares libcurl \
libhubbub libparserutils libcss libwapcaplet) libhubbub libparserutils libcss libdom libwapcaplet)
else else
LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lxml2 -lcurl -lz LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lxml2 -lcurl -lz
endif endif
@ -39,8 +40,8 @@
WSCFLAGS := -std=c99 \ WSCFLAGS := -std=c99 \
$(WARNFLAGS) -I. -I${MINGW_INSTALL_ENV}/include/ \ $(WARNFLAGS) -I. \
-DCURL_STATICLIB -DLIBXML_STATIC -g -DCURL_STATICLIB -DLIBXML_STATIC -DCARES_STATICLIB -g
CFLAGS += $(WSCFLAGS) CFLAGS += $(WSCFLAGS)
LDFLAGS += $(WSCFLAGS) LDFLAGS += $(WSCFLAGS)
@ -50,7 +51,7 @@
$(OBJROOT)/windows_resource.o: windows/res/resource.rc $(OBJROOT)/windows_resource.o: windows/res/resource.rc
$(VQ)echo " WINDRES: compiling windows resources" $(VQ)echo " WINDRES: compiling windows resources"
${Q}$(MINGW_PREFIX)windres $< -O coff -o $@ ${Q}$(WINDRES) $< -O coff -o $@
S_RESOURCES := windows_resource.o S_RESOURCES := windows_resource.o

4
windows/gui.c
View File

@ -1792,7 +1792,7 @@ bool gui_commit_clipboard(void)
{ {
return false; return false;
} }
/*
static bool static bool
gui_selection_traverse_handler(const char *text, gui_selection_traverse_handler(const char *text,
size_t length, size_t length,
@ -1814,7 +1814,7 @@ gui_selection_traverse_handler(const char *text,
return true; return true;
} }
*/
bool gui_copy_to_clipboard(struct selection *s) bool gui_copy_to_clipboard(struct selection *s)
{ {
if (selection_defined(s)) { if (selection_defined(s)) {