intel pict fixes

[wxWidgets.git] / src / jpeg / MAKEFILE.VA

diff --git a/src/jpeg/MAKEFILE.VA b/src/jpeg/MAKEFILE.VA
index 7548d0a8d5ba25f24345fa3add2b3ae06a7ce7fc..ddaef8bd499990174c31a142813be074c1de4566 100644 (file)
--- a/src/jpeg/MAKEFILE.VA
+++ b/src/jpeg/MAKEFILE.VA
@@ -3,8 +3,8 @@
 # Author:    David Webster
 # Created:   1999
 # Updated:
 # Author:    David Webster
 # Created:   1999
 # Updated:

-# Copyright: c) 1993, AIAI, University of Edinburgh
-#
+# Copyright:
+# Licence:   wxWindows Licence

 # "%W% %G%"
 #
 # Makefile : Builds os2jpeg.lib library for OS/2 3.0/4.0
 # "%W% %G%"
 #
 # Makefile : Builds os2jpeg.lib library for OS/2 3.0/4.0


@@ -287,15 +287,15 @@ $(DLIBLIBOBJS):
 $(WXDIR)\lib\os2jpeg1.lib: \
     $(COMLIBOBJS) \
     $(CLIBLIBOBJS)
 $(WXDIR)\lib\os2jpeg1.lib: \
     $(COMLIBOBJS) \
     $(CLIBLIBOBJS)

- touch $(WXDIR)\lib\os2jpeg1.lib
- del $(WXDIR)\lib\os2jpeg1.lib
+ -touch $(WXDIR)\lib\os2jpeg1.lib
+ -del $(WXDIR)\lib\os2jpeg1.lib

  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<
 
 $(WXDIR)\lib\os2jpeg2.lib: $(DLIBLIBOBJS)
  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<
 
 $(WXDIR)\lib\os2jpeg2.lib: $(DLIBLIBOBJS)

- touch $(WXDIR)\lib\os2jpeg2.lib
- del $(WXDIR)\lib\os2jpeg2.lib
+ -touch $(WXDIR)\lib\os2jpeg2.lib
+ -del $(WXDIR)\lib\os2jpeg2.lib

  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<
  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<


@@ -303,8 +303,8 @@ $(WXDIR)\lib\os2jpeg2.lib: $(DLIBLIBOBJS)
 $(WXDIR)\lib\os2jpeg.lib: \
     $(TEMP1TGT) \
     $(TEMP2TGT)
 $(WXDIR)\lib\os2jpeg.lib: \
     $(TEMP1TGT) \
     $(TEMP2TGT)

- touch $(WXDIR)\lib\os2jpeg.lib
- del $(WXDIR)\lib\os2jpeg.lib
+ -touch $(WXDIR)\lib\os2jpeg.lib
+ -del $(WXDIR)\lib\os2jpeg.lib

  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<
  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<


@@ -320,9 +320,9 @@ $(WXDIR)\lib\os2jpeg.dll: $(OBJECTS)
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(OBJECTS)
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(OBJECTS)

-    $(WXDIR)\lib\os2jpeg.def
+    $(WXDIR)\src\os2\os2jpeg.def

 <<
 <<

-    implib $(WXDIR)\lib\os2jpegd.lib $(WXDIR)\lib\os2jpeg.def
+    implib $(WXDIR)\lib\os2jpegd.lib $(WXDIR)\src\os2\os2jpeg.def

 
 !endif
 
 
 !endif