projects / packages / fltk.git / blame
| Commit | Line | Data |
|---|---|---|
| 33e36aec JB |
1 | --- fltk-1.3.3/configure.in.orig 2014-11-18 22:26:21.621181598 +0100 |
| 2 | +++ fltk-1.3.3/configure.in 2014-11-19 16:58:39.211714220 +0100 | |
| 3 | @@ -250,7 +250,7 @@ | |
| 4 | GLDSONAME="libfltk_gl.so.$FL_API_VERSION" | |
| 5 | IMGDSONAME="libfltk_images.so.$FL_API_VERSION" | |
| 6 | CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" | |
| 7 | - DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" | |
| 8 | + DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" | |
| 9 | ||
| 10 | # See if the compiler supports -fvisibility... | |
| 11 | AC_CACHE_CHECK([if the compiler supports -fvisibility], | |
| 12 | --- fltk-1.3.3/src/Makefile.orig 2014-10-30 17:05:22.000000000 +0100 | |
| 13 | +++ fltk-1.3.3/src/Makefile 2014-11-18 22:26:21.624514932 +0100 | |
| 14 | @@ -258,7 +258,7 @@ | |
| 15 | ||
| 16 | libfltk_s.a: $(OBJECTS) | |
| 17 | echo $(DSOCOMMAND) libfltk_s.o ... | |
| 18 | - $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) | |
| 19 | + $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS) | |
| 20 | echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o | |
| 21 | $(RM) $@ | |
| 22 | $(LIBCOMMAND) libfltk_s.a libfltk_s.o | |
| 23 | @@ -294,7 +294,7 @@ | |
| 24 | ||
| 25 | libfltk_forms_s.a: $(FLOBJECTS) | |
| 26 | echo $(DSOCOMMAND) libfltk_forms_s.o ... | |
| 27 | - $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) | |
| 28 | + $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS) | |
| 29 | echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o | |
| 30 | $(RM) $@ | |
| 31 | $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o | |
| 32 | @@ -330,7 +330,7 @@ | |
| 33 | ||
| 34 | libfltk_gl_s.a: $(GLOBJECTS) | |
| 35 | echo $(DSOCOMMAND) libfltk_gl_s.o ... | |
| 36 | - $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) | |
| 37 | + $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(GLDLIBS) | |
| 38 | echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o | |
| 39 | $(RM) $@ | |
| 40 | $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o | |
| 41 | @@ -366,7 +366,7 @@ | |
| 42 | ||
| 43 | libfltk_images_s.a: $(IMGOBJECTS) | |
| 44 | echo $(DSOCOMMAND) libfltk_images_s.o ... | |
| 45 | - $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) | |
| 46 | + $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS) | |
| 47 | echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o | |
| 48 | $(RM) $@ | |
| 49 | $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o | |
| 1163b418 JB |
50 | --- fltk-1.3.3/cairo/Makefile.orig 2014-10-05 02:03:27.000000000 +0200 |
| 51 | +++ fltk-1.3.3/cairo/Makefile 2014-11-19 21:29:49.911031382 +0100 | |
| 52 | @@ -39,7 +39,7 @@ | |
| 53 | ||
| 54 | libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3 | |
| 55 | echo $(DSOCOMMAND) $@ ... | |
| 56 | - $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk | |
| 57 | + $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk -lcairo | |
| 58 | $(RM) libfltk_cairo.so | |
| 59 | $(LN) $(CAIRODSONAME) libfltk_cairo.so | |
| 60 |