added Append(wxArrayString) to wxItemContainer (and so to wxChoice, wxComboBox, wxLis...

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index e349b1108325af9ece0a758bf8c0f9e66e3f62b7..202f56f704c164039d75f7a1ceb2113bdc525c0e 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:52, 2001/10/30
+# This file was automatically generated by tmake at 11:57, 2002/01/17

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc


@@ -21,10 +21,8 @@ THISDIR=$(WXWIN)\src\msw
 
 !if "$(WXMAKINGDLL)" == "1"
 LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll
 
 !if "$(WXMAKINGDLL)" == "1"
 LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll

-DUMMYOBJ=$D\dummydll.obj

 !else
 LIBTARGET=$(WXLIB)
 !else
 LIBTARGET=$(WXLIB)

-DUMMYOBJ=$D\dummy.obj

 !endif
 
 # This one overrides the others, to be consistent with the settings in setup.h
 !endif
 
 # This one overrides the others, to be consistent with the settings in setup.h


@@ -93,6 +91,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
                $(GENDIR)\$D\calctrl.obj \
                $(GENDIR)\$D\choicdgg.obj \
 GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
                $(GENDIR)\$D\calctrl.obj \
                $(GENDIR)\$D\choicdgg.obj \

+               $(GENDIR)\$D\dcpsg.obj \

                $(GENDIR)\$D\dirctrlg.obj \
                $(GENDIR)\$D\dragimgg.obj \
                $(GENDIR)\$D\grid.obj \
                $(GENDIR)\$D\dirctrlg.obj \
                $(GENDIR)\$D\dragimgg.obj \
                $(GENDIR)\$D\grid.obj \


@@ -163,6 +162,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\dseldlg.obj \
                $(COMMDIR)\$D\dynarray.obj \
                $(COMMDIR)\$D\dynlib.obj \
                $(COMMDIR)\$D\dseldlg.obj \
                $(COMMDIR)\$D\dynarray.obj \
                $(COMMDIR)\$D\dynlib.obj \

+               $(COMMDIR)\$D\dynload.obj \

                $(COMMDIR)\$D\effects.obj \
                $(COMMDIR)\$D\encconv.obj \
                $(COMMDIR)\$D\event.obj \
                $(COMMDIR)\$D\effects.obj \
                $(COMMDIR)\$D\encconv.obj \
                $(COMMDIR)\$D\event.obj \


@@ -192,6 +192,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\imagbmp.obj \
                $(COMMDIR)\$D\image.obj \
                $(COMMDIR)\$D\imaggif.obj \
                $(COMMDIR)\$D\imagbmp.obj \
                $(COMMDIR)\$D\image.obj \
                $(COMMDIR)\$D\imaggif.obj \

+               $(COMMDIR)\$D\imagiff.obj \

                $(COMMDIR)\$D\imagjpeg.obj \
                $(COMMDIR)\$D\imagpcx.obj \
                $(COMMDIR)\$D\imagpng.obj \
                $(COMMDIR)\$D\imagjpeg.obj \
                $(COMMDIR)\$D\imagpcx.obj \
                $(COMMDIR)\$D\imagpng.obj \


@@ -213,7 +214,6 @@ COMMONOBJS = \
                $(COMMDIR)\$D\mstream.obj \
                $(COMMDIR)\$D\nbkbase.obj \
                $(COMMDIR)\$D\object.obj \
                $(COMMDIR)\$D\mstream.obj \
                $(COMMDIR)\$D\nbkbase.obj \
                $(COMMDIR)\$D\object.obj \

-               $(COMMDIR)\$D\objstrm.obj \

                $(COMMDIR)\$D\odbc.obj \
                $(COMMDIR)\$D\paper.obj \
                $(COMMDIR)\$D\popupcmn.obj \
                $(COMMDIR)\$D\odbc.obj \
                $(COMMDIR)\$D\paper.obj \
                $(COMMDIR)\$D\popupcmn.obj \


@@ -228,7 +228,6 @@ COMMONOBJS = \
                $(COMMDIR)\$D\sckfile.obj \
                $(COMMDIR)\$D\sckipc.obj \
                $(COMMDIR)\$D\sckstrm.obj \
                $(COMMDIR)\$D\sckfile.obj \
                $(COMMDIR)\$D\sckipc.obj \
                $(COMMDIR)\$D\sckstrm.obj \

-               $(COMMDIR)\$D\serbase.obj \

                $(COMMDIR)\$D\sizer.obj \
                $(COMMDIR)\$D\socket.obj \
                $(COMMDIR)\$D\statbar.obj \
                $(COMMDIR)\$D\sizer.obj \
                $(COMMDIR)\$D\socket.obj \
                $(COMMDIR)\$D\statbar.obj \


@@ -237,6 +236,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\string.obj \
                $(COMMDIR)\$D\sysopt.obj \
                $(COMMDIR)\$D\tbarbase.obj \
                $(COMMDIR)\$D\string.obj \
                $(COMMDIR)\$D\sysopt.obj \
                $(COMMDIR)\$D\tbarbase.obj \

+               $(COMMDIR)\$D\textbuf.obj \

                $(COMMDIR)\$D\textcmn.obj \
                $(COMMDIR)\$D\textfile.obj \
                $(COMMDIR)\$D\timercmn.obj \
                $(COMMDIR)\$D\textcmn.obj \
                $(COMMDIR)\$D\textfile.obj \
                $(COMMDIR)\$D\timercmn.obj \


@@ -393,7 +393,7 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT)
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT)

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

 
 # Normal, static library
 all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
 
 # Normal, static library
 all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)


@@ -402,10 +402,15 @@ $(ARCHINCDIR)\wx:
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 

-$(SETUP_H):
+$(WXDIR)\include\wx\msw\setup.h:
+    cd $(WXDIR)\include\wx\msw
+    if not exist setup.h copy setup0.h setup.h
+    cd $(WXDIR)\src\msw
+
+$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h

     copy $(WXDIR)\include\wx\msw\setup.h $@
 
     copy $(WXDIR)\include\wx\msw\setup.h $@
 

-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D $(ARCHINCDIR)\wx
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D $(ARCHINCDIR)\wx $(WXDIR)\$D

 
 $D:
     mkdir $D
 
 $D:
     mkdir $D


@@ -434,6 +439,10 @@ $(TIFFDIR)\$D:
 $(REGEXDIR)\$D:
     mkdir $(REGEXDIR)\$D
 
 $(REGEXDIR)\$D:
     mkdir $(REGEXDIR)\$D
 

+$(WXDIR)\$D:
+    mkdir $(WXDIR)\$D
+
+

 # wxWindows library as DLL
 dll:
         nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
 # wxWindows library as DLL
 dll:
         nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)


@@ -469,12 +478,12 @@ pch1:   dirs $(DUMMYOBJ)
 
 ### Static library
 
 
 ### Static library
 

-$(WXDIR)\lib\$(WXLIBNAME).lib:      $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
+$(WXDIR)\lib\$(WXLIBNAME).lib:      $(DUMMYOBJ) $(OBJECTS) $(PERIPH_LIBS)

        -erase $(LIBTARGET)
        $(implib) @<<
 -out:$@
 -machine:$(CPU)
        -erase $(LIBTARGET)
        $(implib) @<<
 -out:$@
 -machine:$(CPU)

-$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS)
+$(OBJECTS) $(DUMMYOBJ) $(PERIPH_LIBS)

 <<
 
 !else
 <<
 
 !else


@@ -523,13 +532,8 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
 ########################################################
 # Windows-specific objects
 
 ########################################################
 # Windows-specific objects
 

-$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
-        cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp
-
-$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
-        cl @<<
-$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
-<<
+$(DUMMYOBJ): $(DUMMY).$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
+        cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$(DUMMYOBJ) /c /Tp $(DUMMY).cpp

 
 # Compile certain files with no optimization (some files cause a
 # compiler crash for buggy versions of VC++, e.g. 4.0).
 
 # Compile certain files with no optimization (some files cause a
 # compiler crash for buggy versions of VC++, e.g. 4.0).


@@ -685,6 +689,9 @@ clean: $(PERIPH_CLEAN_TARGET)
         -erase *.pdb
         -erase *.sbr
         -erase $(WXLIBNAME).pch
         -erase *.pdb
         -erase *.sbr
         -erase $(WXLIBNAME).pch

+       -erase $(WXDIR)\$D\$(PCH)
+       -erase $(WXDIR)\$D\*.pdb
+       -erase $(WXDIR)\$D\*.obj

         -erase $(GENDIR)\$D\*.obj
         -erase $(GENDIR)\$D\*.pdb
         -erase $(GENDIR)\$D\*.sbr
         -erase $(GENDIR)\$D\*.obj
         -erase $(GENDIR)\$D\*.pdb
         -erase $(GENDIR)\$D\*.sbr


@@ -719,6 +726,7 @@ clean: $(PERIPH_CLEAN_TARGET)
         -rmdir $(HTMLDIR)\$(D)
         -rmdir $(JPEGDIR)\$(D)
         -rmdir $(TIFFDIR)\$(D)
         -rmdir $(HTMLDIR)\$(D)
         -rmdir $(JPEGDIR)\$(D)
         -rmdir $(TIFFDIR)\$(D)

+       -rmdir $(WXDIR)\$D

 
 # Making documents
 docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp
 
 # Making documents
 docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp