diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 17:24:32 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 17:24:32 +0200 |
commit | b708ee58f7bef7b479f5b6999a8e976d332691b6 (patch) | |
tree | 4b13e9706173c676a0278ca1f565bc54b41943a2 /package/fltk | |
parent | f3cc98651b738ac7f2dc56ea772afa9f874b9d3b (diff) | |
parent | 7c1f6387d20faf69453a59de6c34227f9f2b833c (diff) |
resolve merge
Diffstat (limited to 'package/fltk')
-rw-r--r-- | package/fltk/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/fltk/Makefile b/package/fltk/Makefile index 00795d0b6..d294570b2 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -30,7 +30,7 @@ ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y) LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lgcc_s -lm -lc endif -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) LIBRARIES+=-lssp -lssp_nonshared endif |