Changeset 440


Ignore:
Timestamp:
Jan 9, 2005, 1:17:29 PM (15 years ago)
Author:
Sam Hocevar
Message:
  • deactivated OLE loader and short-lived DeVIL stuff.
Location:
pwntcha/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pwntcha/trunk/configure.ac

    r435 r440  
    2121AC_CHECK_FUNCS(getopt_long)
    2222
     23# Use DevIL?
     24#AC_CHECK_HEADERS(IL/il.h,
     25# [ac_cv_my_have_il="yes"],
     26# [ac_cv_my_have_il="no"])
     27#CPPFLAGS="${save_CPPFLAGS}"
     28#AM_CONDITIONAL(USE_IL, test "${ac_cv_my_have_il}" = "yes")
     29
    2330# Use Windows?
    24 AC_CHECK_HEADERS(olectl.h,
    25  [ac_cv_my_have_ole="yes"],
    26  [ac_cv_my_have_ole="no"])
    27 CPPFLAGS="${save_CPPFLAGS}"
    28 AM_CONDITIONAL(USE_OLE, test "${ac_cv_my_have_ole}" = "yes")
     31#AC_CHECK_HEADERS(olectl.h,
     32# [ac_cv_my_have_ole="yes"],
     33# [ac_cv_my_have_ole="no"])
     34#CPPFLAGS="${save_CPPFLAGS}"
     35#AM_CONDITIONAL(USE_OLE, test "${ac_cv_my_have_ole}" = "yes")
    2936
    3037# Use SDL?
     
    6774AM_CONDITIONAL(USE_IMLIB2, test "${ac_cv_my_have_imlib2}" = "yes")
    6875
    69 if test "${ac_cv_my_have_sdl}" = "yes" -a "${ac_cv_my_have_imlib2}" = "no" -a "${ac_cv_my_have_opencv}" = "no"; then
    70   AC_MSG_ERROR([[cannot find SDL_Image, Imlib2 or OpenCV, please install one of them]])
     76if test "${ac_cv_my_have_il}" = "no" -a "${ac_cv_my_have_ole}" = "no" -a "${ac_cv_my_have_sdl}" = "no" -a "${ac_cv_my_have_imlib2}" = "no" -a "${ac_cv_my_have_opencv}" = "no"; then
     77  AC_MSG_ERROR([[cannot find DevIL, OLE, SDL_Image, Imlib2 or OpenCV, please install one of them]])
    7178fi
    7279
  • pwntcha/trunk/src/Makefile.am

    r435 r440  
    1919pwntcha_LDADD = $(ADDITIONAL_LDADD)
    2020
    21 if USE_OLE
    22 ADDITIONAL_CFLAGS =
    23 ADDITIONAL_LDFLAGS =
    24 ADDITIONAL_LDADD = -luuid -loleaut32 -lole32 -lgdi32
    25 else
     21#if USE_DEVIL
     22#ADDITIONAL_CFLAGS =
     23#ADDITIONAL_LDFLAGS =
     24#ADDITIONAL_LDADD = -lDevIL
     25#else
     26#if USE_OLE
     27#ADDITIONAL_CFLAGS =
     28#ADDITIONAL_LDFLAGS =
     29#ADDITIONAL_LDADD = -luuid -loleaut32 -lole32 -lgdi32
     30#else
    2631if USE_SDL
    2732ADDITIONAL_CFLAGS = `sdl-config --cflags`
     
    4550endif
    4651endif
    47 endif
     52#endif
     53#endif
    4854
Note: See TracChangeset for help on using the changeset viewer.