don't show scrollbars at all when the window is big enough

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 9dcf51c473216e73641693f2c9973c973b209fcf..54fea319ff9b3995fe32fda5b7f1eb354ae2d7f5 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 10:56, 2001/10/08
+# This file was automatically generated by tmake at 16:36, 2001/11/20

 # 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


@@ -93,6 +93,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 \


@@ -139,6 +140,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\appcmn.obj \
                $(COMMDIR)\$D\choiccmn.obj \
                $(COMMDIR)\$D\clipcmn.obj \
                $(COMMDIR)\$D\appcmn.obj \
                $(COMMDIR)\$D\choiccmn.obj \
                $(COMMDIR)\$D\clipcmn.obj \

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

                $(COMMDIR)\$D\cmdline.obj \
                $(COMMDIR)\$D\cmdproc.obj \
                $(COMMDIR)\$D\cmndata.obj \
                $(COMMDIR)\$D\cmdline.obj \
                $(COMMDIR)\$D\cmdproc.obj \
                $(COMMDIR)\$D\cmndata.obj \


@@ -159,6 +161,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\dobjcmn.obj \
                $(COMMDIR)\$D\docmdi.obj \
                $(COMMDIR)\$D\docview.obj \
                $(COMMDIR)\$D\dobjcmn.obj \
                $(COMMDIR)\$D\docmdi.obj \
                $(COMMDIR)\$D\docview.obj \

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

                $(COMMDIR)\$D\dynarray.obj \
                $(COMMDIR)\$D\dynlib.obj \
                $(COMMDIR)\$D\effects.obj \
                $(COMMDIR)\$D\dynarray.obj \
                $(COMMDIR)\$D\dynlib.obj \
                $(COMMDIR)\$D\effects.obj \


@@ -229,11 +232,13 @@ COMMONOBJS = \
                $(COMMDIR)\$D\serbase.obj \
                $(COMMDIR)\$D\sizer.obj \
                $(COMMDIR)\$D\socket.obj \
                $(COMMDIR)\$D\serbase.obj \
                $(COMMDIR)\$D\sizer.obj \
                $(COMMDIR)\$D\socket.obj \

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

                $(COMMDIR)\$D\strconv.obj \
                $(COMMDIR)\$D\stream.obj \
                $(COMMDIR)\$D\string.obj \
                $(COMMDIR)\$D\sysopt.obj \
                $(COMMDIR)\$D\tbarbase.obj \
                $(COMMDIR)\$D\strconv.obj \
                $(COMMDIR)\$D\stream.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 \


@@ -389,15 +394,20 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
 # Add $(HTMLOBJS) if wanting wxHTML classes
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Add $(HTMLOBJS) if wanting wxHTML classes
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 

+ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT)
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+

 # Normal, static library
 # Normal, static library

-all:    setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
+all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)

 
 

-setuph:
-    cd $(WXDIR)\include\wx\msw
-    if not exist setup.h copy setup0.h setup.h
-    cd $(WXDIR)\src\msw
+$(ARCHINCDIR)\wx:
+    mkdir $(ARCHINCDIR)
+    mkdir $(ARCHINCDIR)\wx
+
+$(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
+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


@@ -426,20 +436,24 @@ $(TIFFDIR)\$D:
 $(REGEXDIR)\$D:
     mkdir $(REGEXDIR)\$D
 
 $(REGEXDIR)\$D:
     mkdir $(REGEXDIR)\$D
 

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

 # wxWindows library as DLL
 dll:
 # wxWindows library as DLL
 dll:

-        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)

 
 cleandll:
 
 cleandll:

-        nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
+        nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)

 
 # wxWindows + app as DLL. Only affects main.cpp.
 dllapp:
 
 # wxWindows + app as DLL. Only affects main.cpp.
 dllapp:

-        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)

 
 # wxWindows + app as DLL, for Netscape plugin - remove DllMain.
 dllnp:
 
 # wxWindows + app as DLL, for Netscape plugin - remove DllMain.
 dllnp:

-        nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1
+        nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)

 
 # Use this to make dummy.obj and generate a PCH.
 # You might use the dll target, then the pch target, in order to
 
 # Use this to make dummy.obj and generate a PCH.
 # You might use the dll target, then the pch target, in order to


@@ -515,10 +529,10 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
 ########################################################
 # Windows-specific objects
 
 ########################################################
 # Windows-specific objects
 

-$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
+$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)

         cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp
 
         cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp
 

-$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
+$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)

         cl @<<
 $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 <<
         cl @<<
 $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 <<


@@ -599,7 +613,7 @@ $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
 $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c
 
 $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c
 

-$(OBJECTS):    $(WXDIR)/include/wx/setup.h
+$(OBJECTS):    $(SETUP_H)

 
 $(COMMDIR)\$D\unzip.obj:     $(COMMDIR)\unzip.c
         cl @<<
 
 $(COMMDIR)\$D\unzip.obj:     $(COMMDIR)\unzip.c
         cl @<<