Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/0961589f9c5cdbae05c067a48933fe7548c2203f
...commit
http://git.netsurf-browser.org/netsurf.git/commit/0961589f9c5cdbae05c067a48933fe7548c2203f
...tree
http://git.netsurf-browser.org/netsurf.git/tree/0961589f9c5cdbae05c067a48933fe7548c2203f
The branch, master has been updated
via 0961589f9c5cdbae05c067a48933fe7548c2203f (commit)
via 94959a27c35dd591329d691c4698828b394ade72 (commit)
from cc7d8d81eb59ee94bacb3297661e06f46864a3da (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=0961589f9c5cdbae05c067a48933fe7548c2203f
commit 0961589f9c5cdbae05c067a48933fe7548c2203f
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix resource location
diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
index 3546bcf..19ab43f 100644
--- a/frontends/beos/Makefile
+++ b/frontends/beos/Makefile
@@ -2,6 +2,13 @@
# BeOS target setup
# ----------------------------------------------------------------------------
+# Beos build tools
+BEOS_BERES := beres
+BEOS_RC := rc
+BEOS_XRES := xres
+BEOS_SETVER := setversion
+BEOS_MIMESET := mimeset
+
# Linker flags
LDFLAGS += -L/boot/home/config/lib
LDFLAGS += -L/boot/common/lib
@@ -11,18 +18,16 @@ ifeq ($(CC_MAJOR),2)
else
LDFLAGS += -lstdc++ -lsupc++
endif
+LDFLAGS += -L$(PREFIX)/lib
COMMON_WARNFLAGS += -Wno-multichar
# compiler flags
CFLAGS += -std=c99 -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g
-CXXFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g
+CFLAGS += -I$(PREFIX)/include
-BEOS_BERES := beres
-BEOS_RC := rc
-BEOS_XRES := xres
-BEOS_SETVER := setversion
-BEOS_MIMESET := mimeset
+CXXFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g
+CXXFLAGS += -I$(PREFIX)/include
VERSION_FULL := $(shell sed -n '/_version.*=.*"/{s/.*"\(.*\)".*/\1/;p;}'
desktop/version.c)
VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}'
desktop/version.c)
@@ -73,7 +78,7 @@ RESOURCES = $(RSRC_BEOS)
$(RDEF_IMP_BEOS): $(RDEP_BEOS)
$(VQ)echo " GEN: $@"
- $(Q)n=5000; for f in $^; do echo
"resource($$n,\"$${f#$(FRONTEND_RESOURCES_DIR)/}\") #'data' import
\"$${f#beos/}\";"; n=$$(($$n+1)); done > $@
+ $(Q)n=5000; for f in $^; do echo
"resource($$n,\"$${f#$(FRONTEND_RESOURCES_DIR)/}\") #'data' import
\"$${f#$(FRONTEND_SOURCE_DIR)/}\";"; n=$$(($$n+1)); done > $@
$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS)
$(VQ)echo " RC: $<"
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=94959a27c35dd591329d691c4698828b394ade72
commit 94959a27c35dd591329d691c4698828b394ade72
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fixup tab bar widget icon resource location
diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile
index e608ca8..3c19e76 100644
--- a/frontends/cocoa/Makefile
+++ b/frontends/cocoa/Makefile
@@ -156,10 +156,10 @@ TABBAR_RESOURCES := \
overflowImagePressed.png \
pi.png
-R_RESOURCES += $(addprefix PSMTabBarControl/Images/,$(TABBAR_RESOURCES))
-
R_RESOURCES := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(R_RESOURCES))
+R_RESOURCES += $(addprefix
$(FRONTEND_SOURCE_DIR)/PSMTabBarControl/Images/,$(TABBAR_RESOURCES))
+
LANGUAGES := de en fr it nl
LOCALIZED_RESOURCES := Localizable.strings
-----------------------------------------------------------------------
Summary of changes:
frontends/beos/Makefile | 19 ++++++++++++-------
frontends/cocoa/Makefile | 4 ++--
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
index 3546bcf..19ab43f 100644
--- a/frontends/beos/Makefile
+++ b/frontends/beos/Makefile
@@ -2,6 +2,13 @@
# BeOS target setup
# ----------------------------------------------------------------------------
+# Beos build tools
+BEOS_BERES := beres
+BEOS_RC := rc
+BEOS_XRES := xres
+BEOS_SETVER := setversion
+BEOS_MIMESET := mimeset
+
# Linker flags
LDFLAGS += -L/boot/home/config/lib
LDFLAGS += -L/boot/common/lib
@@ -11,18 +18,16 @@ ifeq ($(CC_MAJOR),2)
else
LDFLAGS += -lstdc++ -lsupc++
endif
+LDFLAGS += -L$(PREFIX)/lib
COMMON_WARNFLAGS += -Wno-multichar
# compiler flags
CFLAGS += -std=c99 -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g
-CXXFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g
+CFLAGS += -I$(PREFIX)/include
-BEOS_BERES := beres
-BEOS_RC := rc
-BEOS_XRES := xres
-BEOS_SETVER := setversion
-BEOS_MIMESET := mimeset
+CXXFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g
+CXXFLAGS += -I$(PREFIX)/include
VERSION_FULL := $(shell sed -n '/_version.*=.*"/{s/.*"\(.*\)".*/\1/;p;}'
desktop/version.c)
VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}'
desktop/version.c)
@@ -73,7 +78,7 @@ RESOURCES = $(RSRC_BEOS)
$(RDEF_IMP_BEOS): $(RDEP_BEOS)
$(VQ)echo " GEN: $@"
- $(Q)n=5000; for f in $^; do echo
"resource($$n,\"$${f#$(FRONTEND_RESOURCES_DIR)/}\") #'data' import
\"$${f#beos/}\";"; n=$$(($$n+1)); done > $@
+ $(Q)n=5000; for f in $^; do echo
"resource($$n,\"$${f#$(FRONTEND_RESOURCES_DIR)/}\") #'data' import
\"$${f#$(FRONTEND_SOURCE_DIR)/}\";"; n=$$(($$n+1)); done > $@
$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS)
$(VQ)echo " RC: $<"
diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile
index e608ca8..3c19e76 100644
--- a/frontends/cocoa/Makefile
+++ b/frontends/cocoa/Makefile
@@ -156,10 +156,10 @@ TABBAR_RESOURCES := \
overflowImagePressed.png \
pi.png
-R_RESOURCES += $(addprefix PSMTabBarControl/Images/,$(TABBAR_RESOURCES))
-
R_RESOURCES := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(R_RESOURCES))
+R_RESOURCES += $(addprefix
$(FRONTEND_SOURCE_DIR)/PSMTabBarControl/Images/,$(TABBAR_RESOURCES))
+
LANGUAGES := de en fr it nl
LOCALIZED_RESOURCES := Localizable.strings
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
