Preparation for incoming OW 1.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ffd84c9476
commit
5b897d36cc
@ -26,52 +26,53 @@
|
||||
<dirname>$(LIBDIRNAME)</dirname>
|
||||
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
|
||||
<cflags-borland>-w-8004 -w-8008 -w-8057 -w-8066</cflags-borland>
|
||||
<cflags-watcom>-wcd=136</cflags-watcom>
|
||||
<sources>
|
||||
src/jpeg/jcomapi.c
|
||||
src/jpeg/jutils.c
|
||||
src/jpeg/jerror.c
|
||||
src/jpeg/jmemmgr.c
|
||||
src/jpeg/jmemnobs.c
|
||||
src/jpeg/jcapimin.c
|
||||
src/jpeg/jcapistd.c
|
||||
src/jpeg/jctrans.c
|
||||
src/jpeg/jcparam.c
|
||||
src/jpeg/jdatadst.c
|
||||
src/jpeg/jcinit.c
|
||||
src/jpeg/jcmaster.c
|
||||
src/jpeg/jcmarker.c
|
||||
src/jpeg/jcmainct.c
|
||||
src/jpeg/jcprepct.c
|
||||
src/jpeg/jccoefct.c
|
||||
src/jpeg/jccolor.c
|
||||
src/jpeg/jcsample.c
|
||||
src/jpeg/jchuff.c
|
||||
src/jpeg/jcphuff.c
|
||||
src/jpeg/jcdctmgr.c
|
||||
src/jpeg/jfdctfst.c
|
||||
src/jpeg/jfdctflt.c
|
||||
src/jpeg/jfdctint.c
|
||||
src/jpeg/jdapimin.c
|
||||
src/jpeg/jdapistd.c
|
||||
src/jpeg/jdtrans.c
|
||||
src/jpeg/jdatasrc.c
|
||||
src/jpeg/jdmaster.c
|
||||
src/jpeg/jdinput.c
|
||||
src/jpeg/jdmarker.c
|
||||
src/jpeg/jdhuff.c
|
||||
src/jpeg/jdphuff.c
|
||||
src/jpeg/jdmainct.c
|
||||
src/jpeg/jdcoefct.c
|
||||
src/jpeg/jdpostct.c
|
||||
src/jpeg/jddctmgr.c
|
||||
src/jpeg/jidctfst.c
|
||||
src/jpeg/jidctflt.c
|
||||
src/jpeg/jidctint.c
|
||||
src/jpeg/jidctred.c
|
||||
src/jpeg/jdsample.c
|
||||
src/jpeg/jdcolor.c
|
||||
src/jpeg/jquant1.c
|
||||
src/jpeg/jquant2.c
|
||||
src/jpeg/jutils.c
|
||||
src/jpeg/jerror.c
|
||||
src/jpeg/jmemmgr.c
|
||||
src/jpeg/jmemnobs.c
|
||||
src/jpeg/jcapimin.c
|
||||
src/jpeg/jcapistd.c
|
||||
src/jpeg/jctrans.c
|
||||
src/jpeg/jcparam.c
|
||||
src/jpeg/jdatadst.c
|
||||
src/jpeg/jcinit.c
|
||||
src/jpeg/jcmaster.c
|
||||
src/jpeg/jcmarker.c
|
||||
src/jpeg/jcmainct.c
|
||||
src/jpeg/jcprepct.c
|
||||
src/jpeg/jccoefct.c
|
||||
src/jpeg/jccolor.c
|
||||
src/jpeg/jcsample.c
|
||||
src/jpeg/jchuff.c
|
||||
src/jpeg/jcphuff.c
|
||||
src/jpeg/jcdctmgr.c
|
||||
src/jpeg/jfdctfst.c
|
||||
src/jpeg/jfdctflt.c
|
||||
src/jpeg/jfdctint.c
|
||||
src/jpeg/jdapimin.c
|
||||
src/jpeg/jdapistd.c
|
||||
src/jpeg/jdtrans.c
|
||||
src/jpeg/jdatasrc.c
|
||||
src/jpeg/jdmaster.c
|
||||
src/jpeg/jdinput.c
|
||||
src/jpeg/jdmarker.c
|
||||
src/jpeg/jdhuff.c
|
||||
src/jpeg/jdphuff.c
|
||||
src/jpeg/jdmainct.c
|
||||
src/jpeg/jdcoefct.c
|
||||
src/jpeg/jdpostct.c
|
||||
src/jpeg/jddctmgr.c
|
||||
src/jpeg/jidctfst.c
|
||||
src/jpeg/jidctflt.c
|
||||
src/jpeg/jidctint.c
|
||||
src/jpeg/jidctred.c
|
||||
src/jpeg/jdsample.c
|
||||
src/jpeg/jdcolor.c
|
||||
src/jpeg/jquant1.c
|
||||
src/jpeg/jquant2.c
|
||||
src/jpeg/jdmerge.c
|
||||
</sources>
|
||||
</lib>
|
||||
|
@ -25,25 +25,26 @@
|
||||
cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
|
||||
<dirname>$(LIBDIRNAME)</dirname>
|
||||
<include>$(INC_ZLIB)</include>
|
||||
<cflags-borland>-w-8004</cflags-borland>
|
||||
<cflags-borland>-w-8004</cflags-borland>
|
||||
<cflags-watcom>-wcd=124</cflags-watcom>
|
||||
<sources>
|
||||
src/png/png.c
|
||||
src/png/pngerror.c
|
||||
src/png/pnggccrd.c
|
||||
src/png/pngget.c
|
||||
src/png/pngmem.c
|
||||
src/png/pngpread.c
|
||||
src/png/pngread.c
|
||||
src/png/pngrio.c
|
||||
src/png/pngrtran.c
|
||||
src/png/pngrutil.c
|
||||
src/png/pngset.c
|
||||
src/png/pngtrans.c
|
||||
src/png/pngvcrd.c
|
||||
src/png/pngwio.c
|
||||
src/png/pngwrite.c
|
||||
src/png/pngwtran.c
|
||||
src/png/pngwutil.c
|
||||
src/png/png.c
|
||||
src/png/pngerror.c
|
||||
src/png/pnggccrd.c
|
||||
src/png/pngget.c
|
||||
src/png/pngmem.c
|
||||
src/png/pngpread.c
|
||||
src/png/pngread.c
|
||||
src/png/pngrio.c
|
||||
src/png/pngrtran.c
|
||||
src/png/pngrutil.c
|
||||
src/png/pngset.c
|
||||
src/png/pngtrans.c
|
||||
src/png/pngvcrd.c
|
||||
src/png/pngwio.c
|
||||
src/png/pngwrite.c
|
||||
src/png/pngwtran.c
|
||||
src/png/pngwutil.c
|
||||
</sources>
|
||||
</lib>
|
||||
|
||||
|
@ -44,6 +44,7 @@
|
||||
<include>$(INC_JPEG)</include>
|
||||
<cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
|
||||
<cflags-dmars>-w2</cflags-dmars>
|
||||
<cflags-watcom>-wcd=124</cflags-watcom>
|
||||
<define cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">OS2_32</define>
|
||||
<define cond="PLATFORM_MSDOS=='1' and FORMAT=='watcom'">__MSDOS__</define>
|
||||
<sources>
|
||||
|
Loading…
Reference in New Issue
Block a user