Ticket #9118: configure_cygwin.diff
File configure_cygwin.diff, 2.0 KB (added by , 15 years ago) |
---|
-
configure
old new 269 269 # 270 270 get_system_exe_extension() { 271 271 case $1 in 272 mingw* | *os2-emx | wince)272 mingw* | cygwin* | *os2-emx | wince) 273 273 _exeext=".exe" 274 274 ;; 275 275 arm-riscos) … … 1148 1148 OBJS="$OBJS scummvmico.o" 1149 1149 ;; 1150 1150 cygwin*) 1151 echo ERROR: Cygwin building is not supported by ScummVM anymore. Consider using MinGW. 1152 exit 0 1151 echo WARNING: Cygwin building is not officially supported by ScummVM anymore. Consider using MinGW. 1152 CC="gcc -mno-cygwin" 1153 CXX="g++ -mno-cygwin" 1154 DEFINES="$DEFINES -DWIN32 -D__USE_MINGW_ANSI_STDIO=0" 1155 LIBS="$LIBS -lmingw32 -lwinmm" 1156 OBJS="$OBJS scummvmico.o" 1157 CXXFLAGS="$CXXFLAGS -mno-cygwin -I/usr/local/include" 1158 LDFLAGS="$LDFLAGS -mno-cygwin -L/usr/local/lib" 1153 1159 ;; 1154 1160 os2-emx*) 1155 1161 DEFINES="$DEFINES -DUNIX" … … 1331 1337 _ranlib=m68k-atari-mint-ranlib 1332 1338 _ar="m68k-atari-mint-ar cru" 1333 1339 ;; 1334 *mingw32* )1340 *mingw32* | *cygwin*) 1335 1341 echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes" 1336 1342 _endian=little 1337 1343 type_1_byte='char' … … 1574 1580 LIBS += -ldl 1575 1581 ' 1576 1582 ;; 1577 *mingw32* )1583 *mingw32* | *cygwin*) 1578 1584 _def_plugin=' 1579 1585 #define PLUGIN_PREFIX "" 1580 1586 #define PLUGIN_SUFFIX ".dll" … … 1884 1890 if test "$_fluidsynth" = yes ; then 1885 1891 _def_fluidsynth='#define USE_FLUIDSYNTH' 1886 1892 case $_host_os in 1887 mingw* )1893 mingw* | cygwin*) 1888 1894 LIBS="$LIBS $FLUIDSYNTH_LIBS -lfluidsynth -ldsound -lwinmm" 1889 1895 ;; 1890 1896 *) … … 1926 1932 os2-emx*) 1927 1933 NASMFLAGS="-f aout" 1928 1934 ;; 1929 mingw* )1935 mingw* | cygwin*) 1930 1936 NASMFLAGS="-f win32" 1931 1937 ;; 1932 1938 darwin*) … … 2071 2077 case $_host_os in 2072 2078 # newlib-based system include files suppress non-C89 function 2073 2079 # declarations under __STRICT_ANSI__ 2074 mingw* | dreamcast | wii | gamecube | psp | wince | amigaos*)2080 mingw* | cygwin* | dreamcast | wii | gamecube | psp | wince | amigaos*) 2075 2081 CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter" 2076 2082 ;; 2077 2083 *)