Unicode compilation fixes

[wxWidgets.git] / src / msw / makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 898c5d2711644b85891e049c5e5d083d4490ed9c..5fe109c698a72bd909b6dc521134895c2f0cf5e2 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 10:56, 2001/11/03
+# This file was automatically generated by tmake at 16:36, 2001/11/20

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #


@@ -202,6 +202,7 @@ COMMONOBJS  = \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/sysopt.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/sysopt.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \

+               $(COMMDIR)/textbuf.$(OBJSUFF) \

                $(COMMDIR)/textcmn.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \
                $(COMMDIR)/timercmn.$(OBJSUFF) \
                $(COMMDIR)/textcmn.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \
                $(COMMDIR)/timercmn.$(OBJSUFF) \


@@ -482,9 +483,27 @@ else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 

-ARCHINCDIR=$(subst /,\,$(WXDIR))\lib\msw$(INCEXT)
+# MBN: if anyone has a better solution for this kludge, step
+#      forward, *please*
+# this tests is we are on cygwin or not ( will _not_ work if you are using
+# ZSH on plain Win32, tought ); it uses the presence of "/"
+# in the PATH variable
+
+# how do you do "VAR=\" ? BLEAGH!
+BACKSLASH=$(subst a,\,a)
+ifeq (,$(findstring /,$(PATH)))
+  IS_CYGWIN=0
+  PATH_SEPARATOR:=$(BACKSLASH)
+  PATH_SUBST=/
+else
+  IS_CYGWIN=1
+  PATH_SEPARATOR=/
+  PATH_SUBST:=$(BACKSLASH)
+endif
+
+ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(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 +511,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:
-       mkdir $(ARCHINCDIR)
-       mkdir $(ARCHINCDIR)\wx
+$(ARCHINCDIR)/wx:
+       mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
+       mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)

 
 

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

 
 ifndef WXMAKINGDLL
 
 
 ifndef WXMAKINGDLL