diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-01-02 13:02:15 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-01-02 13:02:15 +0100 |
| commit | 0dec0e3f4d801673c4fe0d04897718583ee53fb6 (patch) | |
| tree | 0e800992a4c4b9f336da3924af5d305bf356b5d1 | |
| parent | f86011a8ac05229f47fad5b9d87a905edff2a834 (diff) | |
| parent | c95cfb5e806742cb2bd07cb0a2c881b1143ee7c5 (diff) | |
| download | ATCD-0dec0e3f4d801673c4fe0d04897718583ee53fb6.tar.gz | |
Merge branch 'master' of https://github.com/DOCGroup/ATCD
| -rw-r--r-- | ACE/include/makeinclude/platform_freebsd.GNU | 8 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_openbsd.GNU | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ACE/include/makeinclude/platform_freebsd.GNU b/ACE/include/makeinclude/platform_freebsd.GNU index dc635552151..0755943d4b7 100644 --- a/ACE/include/makeinclude/platform_freebsd.GNU +++ b/ACE/include/makeinclude/platform_freebsd.GNU @@ -13,8 +13,8 @@ optimize ?= 1 threads ?= 1 versioned_so ?= 1 -CC = gcc -CXX = g++ +CC ?= gcc +CXX ?= g++ AR = ar ARFLAGS = ruv @@ -56,8 +56,8 @@ PLATFORM_GTK_CPPFLAGS = $(shell gtk-config --cflags) PLATFORM_GTK_LIBS = $(shell gtk-config --libs) PLATFORM_GTK_LDFLAGS = -PLATFORM_FOX_CPPFLAGS ?= -I/usr/include/fox -PLATFORM_FOX_LIBS ?= -lFOX +PLATFORM_FOX_CPPFLAGS ?= -I/usr/local/include/fox-1.6 +PLATFORM_FOX_LIBS ?= -lFOX-1.6 PLATFORM_FOX_LDFLAGS ?= PLATFORM_TK_CPPFLAGS=$(shell . /usr/local/lib/tk8.*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC) diff --git a/ACE/include/makeinclude/platform_openbsd.GNU b/ACE/include/makeinclude/platform_openbsd.GNU index abf21e3dadc..1f6e67d59b0 100644 --- a/ACE/include/makeinclude/platform_openbsd.GNU +++ b/ACE/include/makeinclude/platform_openbsd.GNU @@ -51,8 +51,8 @@ PLATFORM_GTK_CPPFLAGS = $(shell gtk-config --cflags) PLATFORM_GTK_LIBS = $(shell gtk-config --libs) PLATFORM_GTK_LDFLAGS = -PLATFORM_FOX_CPPFLAGS ?= -I/usr/include/fox -PLATFORM_FOX_LIBS ?= -lFOX +PLATFORM_FOX_CPPFLAGS ?= -I/usr/local/include/fox-1.6 +PLATFORM_FOX_LIBS ?= -lFOX-1.6 PLATFORM_FOX_LDFLAGS ?= PLATFORM_TK_CPPFLAGS=$(shell . /usr/local/lib/tcl/tk*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC) $(PLATFORM_X11_CPPFLAGS) |