From 872ae055616205e31316d9e9d5e8fa90db4b3390 Mon Sep 17 00:00:00 2001 From: David Webster Date: Wed, 7 Mar 2001 15:41:22 +0000 Subject: [PATCH 1/1] SUpport for new location of module definition files. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/jpeg/MAKEFILE.VA | 4 ++-- src/os2/makefile.va | 4 ++-- src/png/MAKEFILE.VA | 4 ++-- src/tiff/MAKEFILE.VA | 4 ++-- src/xpm/MAKEFILE.VA | 4 ++-- src/zlib/MAKEFILE.VA | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/jpeg/MAKEFILE.VA b/src/jpeg/MAKEFILE.VA index 7548d0a8d5..9978c36544 100644 --- a/src/jpeg/MAKEFILE.VA +++ b/src/jpeg/MAKEFILE.VA @@ -320,9 +320,9 @@ $(WXDIR)\lib\os2jpeg.dll: $(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 diff --git a/src/os2/makefile.va b/src/os2/makefile.va index 8570d3904e..075469adf6 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -1020,9 +1020,9 @@ $(WXDIR)\lib\wx23.dll: $(OBJECTS) $(LIBS) $(DUMMYOBJ) $(OBJECTS) - $(WXDIR)\lib\wx23.def + $(WXDIR)\src\os2\wx23.def << - implib $(WXDIR)\lib\wx23.lib $(WXDIR)\lib\wx23.def + implib $(WXDIR)\src\os2\wx23.lib $(WXDIR)\src\os2\wx23.def !endif diff --git a/src/png/MAKEFILE.VA b/src/png/MAKEFILE.VA index e7581f96d4..d51c88a25b 100644 --- a/src/png/MAKEFILE.VA +++ b/src/png/MAKEFILE.VA @@ -123,9 +123,9 @@ $(WXDIR)\lib\os2png.dll: $(OBJECTS) /B" $(LINKFLAGS)" /Fe$@ $(LIBS) $(OBJECTS) - $(WXDIR)\lib\os2png.def + $(WXDIR)\src\os2\os2png.def << - implib $(WXDIR)\lib\os2pngd.lib $(WXDIR)\lib\os2png.def + implib $(WXDIR)\lib\os2pngd.lib $(WXDIR)\src\os2\os2png.def !endif diff --git a/src/tiff/MAKEFILE.VA b/src/tiff/MAKEFILE.VA index 2d67a0988d..159f7420ce 100644 --- a/src/tiff/MAKEFILE.VA +++ b/src/tiff/MAKEFILE.VA @@ -179,9 +179,9 @@ $(WXDIR)\lib\os2tiff.dll: $(OBJECTS) /B" $(LINKFLAGS)" /Fe$@ $(LIBS) $(OBJECTS) - $(WXDIR)\lib\os2tiff.def + $(WXDIR)\src\os2\os2tiff.def << - implib $(WXDIR)\lib\os2tiffd.lib $(WXDIR)\lib\os2tiff.def + implib $(WXDIR)\lib\os2tiffd.lib $(WXDIR)\src\os2\os2tiff.def !endif diff --git a/src/xpm/MAKEFILE.VA b/src/xpm/MAKEFILE.VA index 373b45e78c..00a3b0e514 100644 --- a/src/xpm/MAKEFILE.VA +++ b/src/xpm/MAKEFILE.VA @@ -149,9 +149,9 @@ $(WXDIR)\lib\os2xpm.dll: $(OBJECTS) /B" $(LINKFLAGS)" /Fe$@ $(LIBS) $(OBJECTS) - $(WXDIR)\lib\os2xpm.def + $(WXDIR)\src\os2\os2xpm.def << - implib $(WXDIR)\lib\os2xpmd.lib $(WXDIR)\lib\os2xpm.def + implib $(WXDIR)\lib\os2xpmd.lib $(WXDIR)\src\os2\os2xpm.def !endif diff --git a/src/zlib/MAKEFILE.VA b/src/zlib/MAKEFILE.VA index 5a9abb6310..0a5251c2e3 100644 --- a/src/zlib/MAKEFILE.VA +++ b/src/zlib/MAKEFILE.VA @@ -120,9 +120,9 @@ $(WXDIR)\lib\os2zlib.dll: $(OBJECTS) /B" $(LINKFLAGS)" /Fe$@ $(LIBS) $(OBJECTS) - $(WXDIR)\lib\os2zlib.def + $(WXDIR)\src\os2\os2zlib.def << - implib $(WXDIR)\lib\os2zlibd.lib $(WXDIR)\lib\os2zlib.def + implib $(WXDIR)\lib\os2zlibd.lib $(WXDIR)\src\os2\os2zlib.def !endif -- 2.45.2