summaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2012-07-23 21:12:19 +0100
committerVincent Sanders <vince@kyllikki.org>2012-07-23 21:12:19 +0100
commit3faaff91ac61b6a0906dd94a3f9455e31d4d6b43 (patch)
tree5473d0e5ae22f416c44c5f5a7752472dbf8fa9f4 /windows
parent8a6f63fca3cf5dfd4828fc2152df67fe1963e357 (diff)
downloadnetsurf-3faaff91ac61b6a0906dd94a3f9455e31d4d6b43.tar.gz
netsurf-3faaff91ac61b6a0906dd94a3f9455e31d4d6b43.tar.bz2
change to use netsurf toolchain build
Diffstat (limited to 'windows')
-rw-r--r--windows/Makefile.target15
-rw-r--r--windows/gui.c4
2 files changed, 10 insertions, 9 deletions
diff --git a/windows/Makefile.target b/windows/Makefile.target
index 73436679b..084726bc7 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -2,7 +2,8 @@
# 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_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
@@ -17,9 +18,9 @@
ifneq ($(PKG_CONFIG),)
CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl libhubbub zlib \
- libparserutils libxml-2.0)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcurl \
- libhubbub libparserutils libcss libwapcaplet)
+ libparserutils libdom libwapcaplet libcares libxml-2.0)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcares libcurl \
+ libhubbub libparserutils libcss libdom libwapcaplet)
else
LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lxml2 -lcurl -lz
endif
@@ -39,8 +40,8 @@
WSCFLAGS := -std=c99 \
- $(WARNFLAGS) -I. -I${MINGW_INSTALL_ENV}/include/ \
- -DCURL_STATICLIB -DLIBXML_STATIC -g
+ $(WARNFLAGS) -I. \
+ -DCURL_STATICLIB -DLIBXML_STATIC -DCARES_STATICLIB -g
CFLAGS += $(WSCFLAGS)
LDFLAGS += $(WSCFLAGS)
@@ -50,7 +51,7 @@
$(OBJROOT)/windows_resource.o: windows/res/resource.rc
$(VQ)echo " WINDRES: compiling windows resources"
- ${Q}$(MINGW_PREFIX)windres $< -O coff -o $@
+ ${Q}$(WINDRES) $< -O coff -o $@
S_RESOURCES := windows_resource.o
diff --git a/windows/gui.c b/windows/gui.c
index b98bde469..8ad3b32a9 100644
--- a/windows/gui.c
+++ b/windows/gui.c
@@ -1792,7 +1792,7 @@ bool gui_commit_clipboard(void)
{
return false;
}
-
+/*
static bool
gui_selection_traverse_handler(const char *text,
size_t length,
@@ -1814,7 +1814,7 @@ gui_selection_traverse_handler(const char *text,
return true;
}
-
+*/
bool gui_copy_to_clipboard(struct selection *s)
{
if (selection_defined(s)) {