diff options
| author | Ole Loots <ole@monochrom.net> | 2012-12-18 01:28:22 +0100 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2012-12-18 01:28:22 +0100 |
| commit | 3019368c93600a335445c09178c9554074c7f656 (patch) | |
| tree | 872c3bcbba0b74584cda24bee36ffe784806108f /beos/Makefile.target | |
| parent | c6a5109a95c1206ccf63d99316fa12b8c43bb7cf (diff) | |
| parent | 0d803b6c0d252c3a1a9fa07e37d9a0b08ce567b8 (diff) | |
| download | netsurf-3019368c93600a335445c09178c9554074c7f656.tar.gz netsurf-3019368c93600a335445c09178c9554074c7f656.tar.bz2 | |
Merge branch 'master' into mono/removing-windom-dependency
Diffstat (limited to 'beos/Makefile.target')
| -rw-r--r-- | beos/Makefile.target | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/beos/Makefile.target b/beos/Makefile.target index 27981be2d..4edde01a1 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -62,7 +62,7 @@ NETLDFLAGS := -lnetwork endif LDFLAGS += -lbe -ltranslation -ltracker $(NETLDFLAGS) - ifeq ($(GCCVER),2) + ifeq ($(CC_MAJOR),2) LDFLAGS += -lstdc++.r4 else LDFLAGS += -lstdc++ -lsupc++ @@ -78,9 +78,9 @@ NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG - $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP)) - $(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF)) - $(eval $(call pkg_config_find_and_add,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,PNG,libpng,PNG )) endif # ---------------------------------------------------------------------------- |