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

diff --git a/src/jpeg/MAKEFILE.VA b/src/jpeg/MAKEFILE.VA
index 7548d0a8d5ba25f24345fa3add2b3ae06a7ce7fc..9978c365446e1b93960f563e48a9dd508b7ff935 100644 (file)
--- a/src/jpeg/MAKEFILE.VA
+++ b/src/jpeg/MAKEFILE.VA
@@ -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
 

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 8570d3904ee0195bcebc614292fbe18c797a4fa6..075469adf6de267ea6fafcdfe171007b0419d1b7 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -1020,9 +1020,9 @@ $(WXDIR)\lib\wx23.dll: $(OBJECTS)
     $(LIBS)
     $(DUMMYOBJ)
     $(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
 
 
 !endif
 

diff --git a/src/png/MAKEFILE.VA b/src/png/MAKEFILE.VA
index e7581f96d46172022cf5a37d5ef7496d770ebc11..d51c88a25b7bdf8cc5a499eee53f32a10324b93c 100644 (file)
--- a/src/png/MAKEFILE.VA
+++ b/src/png/MAKEFILE.VA
@@ -123,9 +123,9 @@ $(WXDIR)\lib\os2png.dll: $(OBJECTS)
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(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
 
 
 !endif
 

diff --git a/src/tiff/MAKEFILE.VA b/src/tiff/MAKEFILE.VA
index 2d67a0988d20a878e4c3def7f2de6fc54996a343..159f7420ceaf9165831774093a8975f9bb7f1443 100644 (file)
--- a/src/tiff/MAKEFILE.VA
+++ b/src/tiff/MAKEFILE.VA
@@ -179,9 +179,9 @@ $(WXDIR)\lib\os2tiff.dll: $(OBJECTS)
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(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
 
 
 !endif
 

diff --git a/src/xpm/MAKEFILE.VA b/src/xpm/MAKEFILE.VA
index 373b45e78ce2d9d47fcf6558ce7350ad043df934..00a3b0e514f2e3288348f89506b788c7dace2b5a 100644 (file)
--- a/src/xpm/MAKEFILE.VA
+++ b/src/xpm/MAKEFILE.VA
@@ -149,9 +149,9 @@ $(WXDIR)\lib\os2xpm.dll: $(OBJECTS)
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(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
 
 
 !endif
 

diff --git a/src/zlib/MAKEFILE.VA b/src/zlib/MAKEFILE.VA
index 5a9abb6310cd3d8dadeb25369160c6ffdeb7a871..0a5251c2e39a61cc95928c6490cccb87ce6351ee 100644 (file)
--- a/src/zlib/MAKEFILE.VA
+++ b/src/zlib/MAKEFILE.VA
@@ -120,9 +120,9 @@ $(WXDIR)\lib\os2zlib.dll: $(OBJECTS)
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(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
 
 
 !endif