fix for wxSYS_COLOUR_LISTBOX representation

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

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 821763848c6af4407cd54f50348db06e25d2ffef..e6af5575b5dff09654f8b37f74d4d3d240fc69ca 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 22:05, 2001/11/08
+# 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!
 
 #
 # 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)/dseldlg.$(OBJSUFF) \
                $(COMMDIR)/dynarray.$(OBJSUFF) \
                $(COMMDIR)/dynlib.$(OBJSUFF) \

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

                $(COMMDIR)/effects.$(OBJSUFF) \
                $(COMMDIR)/encconv.$(OBJSUFF) \
                $(COMMDIR)/event.$(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)/imagbmp.$(OBJSUFF) \
                $(COMMDIR)/image.$(OBJSUFF) \
                $(COMMDIR)/imaggif.$(OBJSUFF) \

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

                $(COMMDIR)/imagjpeg.$(OBJSUFF) \
                $(COMMDIR)/imagpcx.$(OBJSUFF) \
                $(COMMDIR)/imagpng.$(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)/mstream.$(OBJSUFF) \
                $(COMMDIR)/nbkbase.$(OBJSUFF) \
                $(COMMDIR)/object.$(OBJSUFF) \

-               $(COMMDIR)/objstrm.$(OBJSUFF) \

                $(COMMDIR)/paper.$(OBJSUFF) \
                $(COMMDIR)/popupcmn.$(OBJSUFF) \
                $(COMMDIR)/prntbase.$(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)/sckfile.$(OBJSUFF) \
                $(COMMDIR)/sckipc.$(OBJSUFF) \
                $(COMMDIR)/sckstrm.$(OBJSUFF) \

-               $(COMMDIR)/serbase.$(OBJSUFF) \

                $(COMMDIR)/sizer.$(OBJSUFF) \
                $(COMMDIR)/socket.$(OBJSUFF) \
                $(COMMDIR)/statbar.$(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)/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) \


@@ -243,6 +244,7 @@ HTMLOBJS = \
                $(HTMLDIR)/m_list.$(OBJSUFF) \
                $(HTMLDIR)/m_meta.$(OBJSUFF) \
                $(HTMLDIR)/m_pre.$(OBJSUFF) \
                $(HTMLDIR)/m_list.$(OBJSUFF) \
                $(HTMLDIR)/m_meta.$(OBJSUFF) \
                $(HTMLDIR)/m_pre.$(OBJSUFF) \

+               $(HTMLDIR)/m_style.$(OBJSUFF) \

                $(HTMLDIR)/m_tables.$(OBJSUFF) \
                $(HTMLDIR)/winpars.$(OBJSUFF)
 
                $(HTMLDIR)/m_tables.$(OBJSUFF) \
                $(HTMLDIR)/winpars.$(OBJSUFF)
 


@@ -500,7 +502,8 @@ else
   PATH_SUBST:=$(BACKSLASH)
 endif
 
   PATH_SUBST:=$(BACKSLASH)
 endif
 

-ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
+#ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
+ARCHINCDIR=$(WXDIR)/lib/msw$(INCEXT)

 
 SETUP_H=$(ARCHINCDIR)/wx/setup.h
 
 
 SETUP_H=$(ARCHINCDIR)/wx/setup.h
 


@@ -515,7 +518,9 @@ $(ARCHINCDIR)/wx:
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
 $(SETUP_H): $(ARCHINCDIR)/wx
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
 $(SETUP_H): $(ARCHINCDIR)/wx

-       $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
+       $(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
 
 
 ifndef WXMAKINGDLL