Ticket #1590: patch1.diff

File patch1.diff, 3.2 KB (added by jerrymr@…, 14 years ago)

First patch in restarted cygwin port

  • configure

     
    27262726  echo "Mac accel.       $mac_accel"
    27272727  echo "OpenGL vsync     $opengl_vsync"
    27282728  echo "DirectFB         $direct_fb"
    2729   if test x"$mingw32" = x"yes" -o x"$cygwin" = x"yes" ; then
     2729  if test x"$mingw32" = x"yes" -o x"$targetos" = x"CYGWIN" ; then
    27302730  echo "DirectX          $direct_x"
    27312731fi
    27322732echo
     
    31743174  echo "CONFIG_X264=yes" >> $MYTH_CONFIG_MAK
    31753175fi
    31763176
     3177if test x"$targetos" = x"CYGWIN" ; then
     3178  echo "#define CONFIG_CYGWIN 1" >> $TMPH
     3179  echo "#ifndef llrint" >> $TMPH
     3180  echo "#define llrint llrint  // make sure not to define twice" >> $TMPH
     3181  echo "static inline long long int llrint (double x)" >> $TMPH
     3182  echo "{" >> $TMPH
     3183  echo "    long long int llrintres;" >> $TMPH
     3184  echo "    asm" >> $TMPH
     3185  echo "    (\"fistpll %0\"" >> $TMPH
     3186  echo "    : \"=m\" (llrintres) : \"t\" (x) : \"st\");" >> $TMPH
     3187  echo "    return llrintres;" >> $TMPH
     3188  echo "}" >> $TMPH
     3189  echo "#endif" >> $TMPH
     3190fi
     3191
    31773192if test "$mingw32" = "yes" ; then
    31783193  echo "#define CONFIG_MINGW 1" >> $TMPH
    31793194  echo "CONFIG_MINGW=yes" >> $MYTH_CONFIG_MAK
  • libs/libavcodec/libavcodec.pro

     
    1717    QMAKE_CFLAGS_SHLIB =
    1818}
    1919
     20cygwin {
     21    LIBS += -lz
     22}
     23
    2024QMAKE_CFLAGS_DEBUG += -O
    2125
    2226QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
  • libs/libavformat/libavformat.pro

     
    1313
    1414LIBS += $$LOCAL_LIBDIR_X11
    1515
     16cygwin {
     17    LIBS += -lz
     18}
     19
    1620QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
    1721
    1822# Input
  • libs/libmyth/libmyth.pro

     
    6161inc.files += mythevent.h mythobservable.h mythsocket.h
    6262inc.files += mythexp.h mythpluginapi.h
    6363
     64cygwin {
     65    DEFINES += CONFIG_CYGWIN
     66}
     67
    6468using_oss {
    6569    DEFINES += USING_OSS
    6670    SOURCES += audiooutputoss.cpp
  • libs/libmyth/util.cpp

     
    1818#include <sys/sysinfo.h>
    1919#else
    2020#include <sys/param.h>
     21#ifdef CONFIG_CYGWIN
     22#include <sys/statfs.h>
     23#else
    2124#include <sys/sysctl.h>
     25#endif
    2226#include <sys/mount.h>
    2327#endif
    2428
  • settings.pro

     
    77LIBVERSION = 0.20
    88VERSION = 0.20.0
    99
     10# if CYGWIN compile, set up flag in CONFIG
     11contains(TARGET_OS, CYGWIN) {
     12   CONFIG += cygwin
     13}
     14
    1015# Die on the (common) case where OS X users inadvertently use Fink's
    1116# Qt/X11 install instead of Qt/Mac. '
    1217contains(CONFIG_DARWIN, yes) {