applied the bit's of #473508 that were still relevant, and fixed a couple of

others that either the patch missed or (more likely) were new since it was
made.  Thanks Francis.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 898c5d2711644b85891e049c5e5d083d4490ed9c..f5369aa6dc041ddfef09e5855a7994733f697f3c 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -482,9 +482,9 @@ else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 

-ARCHINCDIR=$(subst /,\,$(WXDIR))\lib\msw$(INCEXT)
+ARCHINCDIR=$(subst /,\,$(WXDIR))/lib/msw$(INCEXT)

 
 

-SETUP_H=$(ARCHINCDIR)\wx\setup.h
+SETUP_H=$(ARCHINCDIR)/wx/setup.h

 
 ifndef WXMAKINGDLL
 all:    $(SETUP_H) $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB)
 
 ifndef WXMAKINGDLL
 all:    $(SETUP_H) $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB)


@@ -492,12 +492,12 @@ else
 all:    $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) $(WXDLL)
 endif
 
 all:    $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) $(WXDLL)
 endif
 

-$(ARCHINCDIR)\wx:
+$(ARCHINCDIR)/wx:

        mkdir $(ARCHINCDIR)
        mkdir $(ARCHINCDIR)

-       mkdir $(ARCHINCDIR)\wx
+       mkdir $(ARCHINCDIR)/wx

 
 

-$(SETUP_H): $(ARCHINCDIR)\wx
-       $(COPY) $(WXDIR)\include\wx\msw\setup.h $@
+$(SETUP_H): $(ARCHINCDIR)/wx
+       $(COPY) $(WXDIR)/include/wx/msw/setup.h $@

 
 ifndef WXMAKINGDLL
 
 
 ifndef WXMAKINGDLL