X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/180db9083613b9b6eca8451ee19553c6581f5505..1483041dab88f43563c26405c1e2a41d6babe6a0:/src/msw/makefile.g95?ds=sidebyside

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index f5369aa6dc..e6af5575b5 100644
--- 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 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -129,6 +129,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/dseldlg.$(OBJSUFF) \
 		$(COMMDIR)/dynarray.$(OBJSUFF) \
 		$(COMMDIR)/dynlib.$(OBJSUFF) \
+		$(COMMDIR)/dynload.$(OBJSUFF) \
 		$(COMMDIR)/effects.$(OBJSUFF) \
 		$(COMMDIR)/encconv.$(OBJSUFF) \
 		$(COMMDIR)/event.$(OBJSUFF) \
@@ -158,6 +159,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/imagbmp.$(OBJSUFF) \
 		$(COMMDIR)/image.$(OBJSUFF) \
 		$(COMMDIR)/imaggif.$(OBJSUFF) \
+		$(COMMDIR)/imagiff.$(OBJSUFF) \
 		$(COMMDIR)/imagjpeg.$(OBJSUFF) \
 		$(COMMDIR)/imagpcx.$(OBJSUFF) \
 		$(COMMDIR)/imagpng.$(OBJSUFF) \
@@ -179,7 +181,6 @@ COMMONOBJS  = \
 		$(COMMDIR)/mstream.$(OBJSUFF) \
 		$(COMMDIR)/nbkbase.$(OBJSUFF) \
 		$(COMMDIR)/object.$(OBJSUFF) \
-		$(COMMDIR)/objstrm.$(OBJSUFF) \
 		$(COMMDIR)/paper.$(OBJSUFF) \
 		$(COMMDIR)/popupcmn.$(OBJSUFF) \
 		$(COMMDIR)/prntbase.$(OBJSUFF) \
@@ -193,7 +194,6 @@ COMMONOBJS  = \
 		$(COMMDIR)/sckfile.$(OBJSUFF) \
 		$(COMMDIR)/sckipc.$(OBJSUFF) \
 		$(COMMDIR)/sckstrm.$(OBJSUFF) \
-		$(COMMDIR)/serbase.$(OBJSUFF) \
 		$(COMMDIR)/sizer.$(OBJSUFF) \
 		$(COMMDIR)/socket.$(OBJSUFF) \
 		$(COMMDIR)/statbar.$(OBJSUFF) \
@@ -202,6 +202,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/string.$(OBJSUFF) \
 		$(COMMDIR)/sysopt.$(OBJSUFF) \
 		$(COMMDIR)/tbarbase.$(OBJSUFF) \
+		$(COMMDIR)/textbuf.$(OBJSUFF) \
 		$(COMMDIR)/textcmn.$(OBJSUFF) \
 		$(COMMDIR)/textfile.$(OBJSUFF) \
 		$(COMMDIR)/timercmn.$(OBJSUFF) \
@@ -243,6 +244,7 @@ HTMLOBJS = \
 		$(HTMLDIR)/m_list.$(OBJSUFF) \
 		$(HTMLDIR)/m_meta.$(OBJSUFF) \
 		$(HTMLDIR)/m_pre.$(OBJSUFF) \
+		$(HTMLDIR)/m_style.$(OBJSUFF) \
 		$(HTMLDIR)/m_tables.$(OBJSUFF) \
 		$(HTMLDIR)/winpars.$(OBJSUFF)
 
@@ -482,7 +484,26 @@ else
   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))
+ARCHINCDIR=$(WXDIR)/lib/msw$(INCEXT)
 
 SETUP_H=$(ARCHINCDIR)/wx/setup.h
 
@@ -493,12 +514,14 @@ all:    $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEX
 endif
 
 $(ARCHINCDIR)/wx:
-	mkdir $(ARCHINCDIR)
-	mkdir $(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 $@
 
+#	$(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
+
 ifndef WXMAKINGDLL
 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)