From d03ce671384428a1b0ee43b6caa5860f6275bcb6 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 1 May 2006 08:00:49 +0000 Subject: [PATCH] Packed the OS/2 build files into Watcom-OS2.zip --- Makefile-EXE.wat | 30 ---------- Makefile.am | 1 + Makefile.wat | 83 -------------------------- SDLIMAGE.lnk | 150 ----------------------------------------------- Watcom-EXE.mif | 30 ---------- Watcom-OS2.zip | Bin 0 -> 3928 bytes Watcom.mif | 32 ---------- showimage.lnk | 22 ------- 8 files changed, 1 insertion(+), 347 deletions(-) delete mode 100644 Makefile-EXE.wat delete mode 100644 Makefile.wat delete mode 100644 SDLIMAGE.lnk delete mode 100644 Watcom-EXE.mif create mode 100644 Watcom-OS2.zip delete mode 100644 Watcom.mif delete mode 100644 showimage.lnk diff --git a/Makefile-EXE.wat b/Makefile-EXE.wat deleted file mode 100644 index 1859ca4b..00000000 --- a/Makefile-EXE.wat +++ /dev/null @@ -1,30 +0,0 @@ -#============================================================================= -# This is a Watcom makefile to build application for OS/2 -# -# -#============================================================================= - -object_files= showimage.obj - -# Extra stuffs to pass to C compiler: -ExtraCFlags= - -# -#============================================================================== -# -!include Watcom-EXE.mif - -.before - @set include=$(%os2tk)\h;$(%include);$(%sdlhome)\include;.\; - -all : showimage.exe - -showimage.exe: $(object_files) - wlink @showimage.lnk - -clean : .SYMBOLIC - @if exist showimage.exe del showimage.exe - @if exist showimage.obj del showimage.obj - @if exist *.map del *.map - @if exist *.res del *.res - @if exist *.lst del *.lst diff --git a/Makefile.am b/Makefile.am index 2e8454a6..8d1a17d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,6 +26,7 @@ EXTRA_DIST = \ VisualC.zip \ Xcode.tar.gz \ MPWmake.sea.bin \ + Watcom-OS2.zip \ IMG_xxx.c \ SDL_image.spec \ SDL_image.spec.in \ diff --git a/Makefile.wat b/Makefile.wat deleted file mode 100644 index 7dde311c..00000000 --- a/Makefile.wat +++ /dev/null @@ -1,83 +0,0 @@ -#============================================================================= -# This is a Watcom makefile to build SDLIMAGE.DLL for OS/2 -# -# -#============================================================================= - -dllname=SDLIMAGE - -zlibfiles=zlib121\adler32.obj zlib121\compress.obj zlib121\crc32.obj zlib121\deflate.obj zlib121\gzio.obj zlib121\infback.obj zlib121\inffast.obj zlib121\inflate.obj zlib121\inftrees.obj zlib121\trees.obj zlib121\uncompr.obj zlib121\zutil.obj -libpngfiles=lpng125\png.obj lpng125\pngerror.obj lpng125\pnggccrd.obj lpng125\pngget.obj lpng125\pngmem.obj lpng125\pngpread.obj lpng125\pngread.obj lpng125\pngrio.obj lpng125\pngrtran.obj lpng125\pngrutil.obj lpng125\pngset.obj lpng125\pngtest.obj lpng125\pngtrans.obj lpng125\pngvcrd.obj lpng125\pngwio.obj lpng125\pngwrite.obj lpng125\pngwtran.obj lpng125\pngwutil.obj -libjpgfiles=jpeg-6b\jcapimin.obj jpeg-6b\jcapistd.obj jpeg-6b\jccoefct.obj jpeg-6b\jccolor.obj jpeg-6b\jcdctmgr.obj jpeg-6b\jchuff.obj & - jpeg-6b\jcinit.obj jpeg-6b\jcmainct.obj jpeg-6b\jcmarker.obj jpeg-6b\jcmaster.obj jpeg-6b\jcomapi.obj jpeg-6b\jcparam.obj & - jpeg-6b\jcphuff.obj jpeg-6b\jcprepct.obj jpeg-6b\jcsample.obj jpeg-6b\jctrans.obj jpeg-6b\jdapimin.obj jpeg-6b\jdapistd.obj & - jpeg-6b\jdatadst.obj jpeg-6b\jdatasrc.obj jpeg-6b\jdcoefct.obj jpeg-6b\jdcolor.obj jpeg-6b\jddctmgr.obj jpeg-6b\jdhuff.obj & - jpeg-6b\jdinput.obj jpeg-6b\jdmainct.obj jpeg-6b\jdmarker.obj jpeg-6b\jdmaster.obj jpeg-6b\jdmerge.obj jpeg-6b\jdphuff.obj & - jpeg-6b\jdpostct.obj jpeg-6b\jdsample.obj jpeg-6b\jdtrans.obj jpeg-6b\jerror.obj jpeg-6b\jfdctflt.obj jpeg-6b\jfdctfst.obj & - jpeg-6b\jfdctint.obj jpeg-6b\jidctflt.obj jpeg-6b\jidctfst.obj jpeg-6b\jidctint.obj jpeg-6b\jidctred.obj jpeg-6b\jquant1.obj & - jpeg-6b\jquant2.obj jpeg-6b\jutils.obj jpeg-6b\jmemmgr.obj jpeg-6b\jmemnobs.obj -tifffiles=tiff-v3.6.1\libtiff\fax3sm_winnt.obj & - tiff-v3.6.1\libtiff\tif_aux.obj & - tiff-v3.6.1\libtiff\tif_close.obj & - tiff-v3.6.1\libtiff\tif_codec.obj & - tiff-v3.6.1\libtiff\tif_color.obj & - tiff-v3.6.1\libtiff\tif_compress.obj & - tiff-v3.6.1\libtiff\tif_dir.obj & - tiff-v3.6.1\libtiff\tif_dirinfo.obj & - tiff-v3.6.1\libtiff\tif_dirread.obj & - tiff-v3.6.1\libtiff\tif_dirwrite.obj & - tiff-v3.6.1\libtiff\tif_dumpmode.obj & - tiff-v3.6.1\libtiff\tif_error.obj & - tiff-v3.6.1\libtiff\tif_extension.obj & - tiff-v3.6.1\libtiff\tif_fax3.obj & - tiff-v3.6.1\libtiff\tif_flush.obj & - tiff-v3.6.1\libtiff\tif_getimage.obj & - tiff-v3.6.1\libtiff\tif_jpeg.obj & - tiff-v3.6.1\libtiff\tif_luv.obj & - tiff-v3.6.1\libtiff\tif_lzw.obj & - tiff-v3.6.1\libtiff\tif_msdos.obj & - tiff-v3.6.1\libtiff\tif_next.obj & - tiff-v3.6.1\libtiff\tif_ojpeg.obj & - tiff-v3.6.1\libtiff\tif_open.obj & - tiff-v3.6.1\libtiff\tif_packbits.obj & - tiff-v3.6.1\libtiff\tif_pixarlog.obj & - tiff-v3.6.1\libtiff\tif_predict.obj & - tiff-v3.6.1\libtiff\tif_print.obj & - tiff-v3.6.1\libtiff\tif_read.obj & - tiff-v3.6.1\libtiff\tif_strip.obj & - tiff-v3.6.1\libtiff\tif_swab.obj & - tiff-v3.6.1\libtiff\tif_thunder.obj & - tiff-v3.6.1\libtiff\tif_tile.obj & - tiff-v3.6.1\libtiff\tif_version.obj & - tiff-v3.6.1\libtiff\tif_warning.obj & - tiff-v3.6.1\libtiff\tif_write.obj & - tiff-v3.6.1\libtiff\tif_zip.obj - -object_files= IMG.obj IMG_bmp.obj IMG_gif.obj IMG_jpg.obj IMG_lbm.obj IMG_pcx.obj IMG_png.obj IMG_pnm.obj IMG_tga.obj IMG_tif.obj IMG_xcf.obj IMG_xpm.obj IMG_xxx.obj $(zlibfiles) $(libpngfiles) $(tifffiles) - -# Extra stuffs to pass to C compiler: -ExtraCFlags=-DLOAD_BMP -DLOAD_GIF -DLOAD_JPG -DLOAD_LBM -DLOAD_PCX -DLOAD_PNG -DLOAD_PNM -DLOAD_XCF -DLOAD_XPM -DLOAD_XXX -DLOAD_TGA -DLOAD_TIF - -# -#============================================================================== -# -!include Watcom.mif - -.before - @set include=$(%os2tk)\h;$(%include);$(%sdlhome)\include;.\;.\jpeg-6b;.\lpng125;.\zlib121;.\tiff-v3.6.1\libtiff; - -all : $(dllname).dll $(dllname).lib - -$(dllname).dll : $(object_files) - wlink @$(dllname) - -$(dllname).lib : $(dllname).dll - implib $(dllname).lib $(dllname).dll - -clean : .SYMBOLIC - @if exist $(dllname).dll del $(dllname).dll - @if exist *.lib del *.lib - @if exist *.obj del *.obj - @if exist *.map del *.map - @if exist *.res del *.res - @if exist *.lst del *.lst diff --git a/SDLIMAGE.lnk b/SDLIMAGE.lnk deleted file mode 100644 index 333c9a34..00000000 --- a/SDLIMAGE.lnk +++ /dev/null @@ -1,150 +0,0 @@ -#============================================================================= -# This is a linker file to build SDLIMAGE.DLL for OS/2 -# -# -#============================================================================= - -system 386 LX DLL INITINSTANCE TERMINSTANCE -name SDLIMAGE - -# Object files from \. - -file IMG -file IMG_bmp -file IMG_gif -file IMG_jpg -file IMG_lbm -file IMG_pcx -file IMG_png -file IMG_pnm -file IMG_tga -file IMG_tif -file IMG_xcf -file IMG_xpm -file IMG_xxx - -file zlib121\adler32 -file zlib121\compress -file zlib121\crc32 -file zlib121\deflate -file zlib121\gzio -file zlib121\infback -file zlib121\inffast -file zlib121\inflate -file zlib121\inftrees -file zlib121\trees -file zlib121\uncompr -file zlib121\zutil - -file lpng125\png -file lpng125\pngerror -file lpng125\pnggccrd -file lpng125\pngget -file lpng125\pngmem -file lpng125\pngpread -file lpng125\pngread -file lpng125\pngrio -file lpng125\pngrtran -file lpng125\pngrutil -file lpng125\pngset -file lpng125\pngtest -file lpng125\pngtrans -file lpng125\pngvcrd -file lpng125\pngwio -file lpng125\pngwrite -file lpng125\pngwtran -file lpng125\pngwutil - -file jpeg-6b\jcapimin.obj -file jpeg-6b\jcapistd.obj -file jpeg-6b\jccoefct.obj -file jpeg-6b\jccolor.obj -file jpeg-6b\jcdctmgr.obj -file jpeg-6b\jchuff.obj -file jpeg-6b\jcinit.obj -file jpeg-6b\jcmainct.obj -file jpeg-6b\jcmarker.obj -file jpeg-6b\jcmaster.obj -file jpeg-6b\jcomapi.obj -file jpeg-6b\jcparam.obj -file jpeg-6b\jcphuff.obj -file jpeg-6b\jcprepct.obj -file jpeg-6b\jcsample.obj -file jpeg-6b\jctrans.obj -file jpeg-6b\jdapimin.obj -file jpeg-6b\jdapistd.obj -file jpeg-6b\jdatadst.obj -file jpeg-6b\jdatasrc.obj -file jpeg-6b\jdcoefct.obj -file jpeg-6b\jdcolor.obj -file jpeg-6b\jddctmgr.obj -file jpeg-6b\jdhuff.obj -file jpeg-6b\jdinput.obj -file jpeg-6b\jdmainct.obj -file jpeg-6b\jdmarker.obj -file jpeg-6b\jdmaster.obj -file jpeg-6b\jdmerge.obj -file jpeg-6b\jdphuff.obj -file jpeg-6b\jdpostct.obj -file jpeg-6b\jdsample.obj -file jpeg-6b\jdtrans.obj -file jpeg-6b\jerror.obj -file jpeg-6b\jfdctflt.obj -file jpeg-6b\jfdctfst.obj -file jpeg-6b\jfdctint.obj -file jpeg-6b\jidctflt.obj -file jpeg-6b\jidctfst.obj -file jpeg-6b\jidctint.obj -file jpeg-6b\jidctred.obj -file jpeg-6b\jquant1.obj -file jpeg-6b\jquant2.obj -file jpeg-6b\jutils.obj -file jpeg-6b\jmemmgr.obj -file jpeg-6b\jmemnobs.obj - -file tiff-v3.6.1\libtiff\fax3sm_winnt.obj -file tiff-v3.6.1\libtiff\tif_aux.obj -file tiff-v3.6.1\libtiff\tif_close.obj -file tiff-v3.6.1\libtiff\tif_codec.obj -file tiff-v3.6.1\libtiff\tif_color.obj -file tiff-v3.6.1\libtiff\tif_compress.obj -file tiff-v3.6.1\libtiff\tif_dir.obj -file tiff-v3.6.1\libtiff\tif_dirinfo.obj -file tiff-v3.6.1\libtiff\tif_dirread.obj -file tiff-v3.6.1\libtiff\tif_dirwrite.obj -file tiff-v3.6.1\libtiff\tif_dumpmode.obj -file tiff-v3.6.1\libtiff\tif_error.obj -file tiff-v3.6.1\libtiff\tif_extension.obj -file tiff-v3.6.1\libtiff\tif_fax3.obj -file tiff-v3.6.1\libtiff\tif_flush.obj -file tiff-v3.6.1\libtiff\tif_getimage.obj -file tiff-v3.6.1\libtiff\tif_jpeg.obj -file tiff-v3.6.1\libtiff\tif_luv.obj -file tiff-v3.6.1\libtiff\tif_lzw.obj -file tiff-v3.6.1\libtiff\tif_msdos.obj -file tiff-v3.6.1\libtiff\tif_next.obj -file tiff-v3.6.1\libtiff\tif_ojpeg.obj -file tiff-v3.6.1\libtiff\tif_open.obj -file tiff-v3.6.1\libtiff\tif_packbits.obj -file tiff-v3.6.1\libtiff\tif_pixarlog.obj -file tiff-v3.6.1\libtiff\tif_predict.obj -file tiff-v3.6.1\libtiff\tif_print.obj -file tiff-v3.6.1\libtiff\tif_read.obj -file tiff-v3.6.1\libtiff\tif_strip.obj -file tiff-v3.6.1\libtiff\tif_swab.obj -file tiff-v3.6.1\libtiff\tif_thunder.obj -file tiff-v3.6.1\libtiff\tif_tile.obj -file tiff-v3.6.1\libtiff\tif_version.obj -file tiff-v3.6.1\libtiff\tif_warning.obj -file tiff-v3.6.1\libtiff\tif_write.obj -file tiff-v3.6.1\libtiff\tif_zip.obj - -OPTION MAP=SDLIMAGE -OPTION DESCRIPTION 'Simple DirectMedia Layer Image Library v1.2.5' -OPTION ELIMINATE -OPTION MANYAUTODATA -OPTION OSNAME='OS/2 and eComStation' -OPTION SHOWDEAD -LIBPATH %os2tk%\lib -LIBPATH %sdlhome%\src -lib sdl diff --git a/Watcom-EXE.mif b/Watcom-EXE.mif deleted file mode 100644 index 764a652a..00000000 --- a/Watcom-EXE.mif +++ /dev/null @@ -1,30 +0,0 @@ -#============================================================================= -# This file contains the common includes for the -# Watcom makefiles to build EXE applications for OS/2 -# -# -#============================================================================= - -# Create debug build or not? -debug_build=defined - -# -#============================================================================== -# - -!ifdef debug_build -debugflags = -d2 -dDEBUG_BUILD -!else -debugflags = -!endif - -cflags = -zq $(debugflags) -bm -bt=OS2 -5s -fpi -sg -otexan -wx -ei $(ExtraCFlags) - -.extensions: -.extensions: .lib .dll .obj .c .cpp .exe - -.c.obj : .AUTODEPEND - wcc386 $[* $(cflags) - -.cpp.obj : .AUTODEPEND - wpp386 $[* $(cflags) diff --git a/Watcom-OS2.zip b/Watcom-OS2.zip new file mode 100644 index 0000000000000000000000000000000000000000..6970ee86e348ee32f5479f58f8006b6c8ef5a7f6 GIT binary patch literal 3928 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 literal 0 HcmV?d00001 diff --git a/Watcom.mif b/Watcom.mif deleted file mode 100644 index cfb1d798..00000000 --- a/Watcom.mif +++ /dev/null @@ -1,32 +0,0 @@ -#============================================================================= -# This file contains the common includes for the -# Watcom makefiles to build SDLIMAGE.DLL for OS/2 -# -# -#============================================================================= - -# Create debug build or not? -#debug_build=defined - -SDLImageFlags=-DBUILD_SDL - -# -#============================================================================== -# - -!ifdef debug_build -debugflags = -d2 -dDEBUG_BUILD -!else -debugflags = -!endif - -cflags = -zq $(debugflags) -bd -bm -bt=OS2 -5s -fpi -sg -otexan -wx -ei $(SDLImageFlags) $(ExtraCFlags) - -.extensions: -.extensions: .lib .dll .obj .c .cpp - -.c.obj : .AUTODEPEND - wcc386 $[* $(cflags) - -.cpp.obj : .AUTODEPEND - wpp386 $[* $(cflags) diff --git a/showimage.lnk b/showimage.lnk deleted file mode 100644 index b288dbde..00000000 --- a/showimage.lnk +++ /dev/null @@ -1,22 +0,0 @@ -#============================================================================= -# This is a linker file to build SDLMIXER test app for OS/2 -# -# -#============================================================================= - -system os2v2_pm - -file showimage - -OPTION MAP=showimage -OPTION DESCRIPTION 'Test Application' -OPTION ELIMINATE -OPTION MANYAUTODATA -OPTION OSNAME='OS/2 and eComStation' -OPTION SHOWDEAD -LIBPATH %os2tk%\lib -LIBPATH %sdlhome%\src -LIBPATH . -lib sdl -lib sdlimage -