Changeset 440
- Timestamp:
- Jan 9, 2005, 1:17:29 PM (18 years ago)
- Location:
- pwntcha/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pwntcha/trunk/configure.ac
r435 r440 21 21 AC_CHECK_FUNCS(getopt_long) 22 22 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 23 30 # 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") 29 36 30 37 # Use SDL? … … 67 74 AM_CONDITIONAL(USE_IMLIB2, test "${ac_cv_my_have_imlib2}" = "yes") 68 75 69 if test "${ac_cv_my_have_ sdl}" = "yes" -a "${ac_cv_my_have_imlib2}" = "no" -a "${ac_cv_my_have_opencv}" = "no"; then70 AC_MSG_ERROR([[cannot find SDL_Image, Imlib2 or OpenCV, please install one of them]])76 if 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]]) 71 78 fi 72 79 -
pwntcha/trunk/src/Makefile.am
r435 r440 19 19 pwntcha_LDADD = $(ADDITIONAL_LDADD) 20 20 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 26 31 if USE_SDL 27 32 ADDITIONAL_CFLAGS = `sdl-config --cflags` … … 45 50 endif 46 51 endif 47 endif 52 #endif 53 #endif 48 54
Note: See TracChangeset
for help on using the changeset viewer.