Added more compat. functions for wxGrid so grid sample compiles;

[wxWidgets.git] / samples / makefile.vc

diff --git a/samples/makefile.vc b/samples/makefile.vc
index d11885030622a1ccfb09944280907bef0dc845c6..6edb3485bbe27875a5bb4a6eb1ad99f4eba7a7c7 100644 (file)
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -26,7 +26,7 @@ NOMAKE=1
 # Misc. compilation errors
 COMPIL=1
 # Need PNG
 # Misc. compilation errors
 COMPIL=1
 # Need PNG

-PNGSETUP=1
+PNGSETUP=

 
 !include $(WXDIR)\src\makemsc.env
 
 
 !include $(WXDIR)\src\makemsc.env
 


@@ -44,10 +44,8 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\controls
         nmake -f makefile.vc FINAL=$(FINAL)
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\controls
         nmake -f makefile.vc FINAL=$(FINAL)

-!if "$(COMPIL)"==""

         cd $(WXDIR)\samples\db
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\db
         nmake -f makefile.vc FINAL=$(FINAL)

-!endif

         cd $(WXDIR)\samples\dde
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\dialogs
         cd $(WXDIR)\samples\dde
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\dialogs


@@ -68,6 +66,8 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\grid
         nmake -f makefile.vc FINAL=$(FINAL)
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\grid
         nmake -f makefile.vc FINAL=$(FINAL)

+        cd $(WXDIR)\samples\newgrid
+        nmake -f makefile.vc FINAL=$(FINAL)

 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\help
         nmake -f makefile.vc FINAL=$(FINAL)
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\help
         nmake -f makefile.vc FINAL=$(FINAL)


@@ -114,10 +114,8 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\proplist
         nmake -f makefile.vc FINAL=$(FINAL)
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\proplist
         nmake -f makefile.vc FINAL=$(FINAL)

-!if "$(COMPIL)"==""

         cd $(WXDIR)\samples\regtest
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\regtest
         nmake -f makefile.vc FINAL=$(FINAL)

-!endif

         cd $(WXDIR)\samples\resource
         nmake -f makefile.vc FINAL=$(FINAL)
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\resource
         nmake -f makefile.vc FINAL=$(FINAL)
 !if "$(COMPIL)"==""


@@ -130,12 +128,10 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\splitter
         nmake -f makefile.vc FINAL=$(FINAL)
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\splitter
         nmake -f makefile.vc FINAL=$(FINAL)

-!if "$(COMPIL)"==""

         cd $(WXDIR)\samples\tab
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\taskbar
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\tab
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\taskbar
         nmake -f makefile.vc FINAL=$(FINAL)

-!endif

         cd $(WXDIR)\samples\text
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\thread
         cd $(WXDIR)\samples\text
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\thread


@@ -144,22 +140,16 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\treectrl
         nmake -f makefile.vc FINAL=$(FINAL)
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\treectrl
         nmake -f makefile.vc FINAL=$(FINAL)

-!if "$(COMPIL)"==""

         cd $(WXDIR)\samples\typetest
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\typetest
         nmake -f makefile.vc FINAL=$(FINAL)

-!endif

         cd $(WXDIR)\samples\validate
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\validate
         nmake -f makefile.vc FINAL=$(FINAL)

-!if "$(NOMAKE)"==""

         cd $(WXDIR)\samples\wizard
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\wizard
         nmake -f makefile.vc FINAL=$(FINAL)

-!endif

         cd $(WXDIR)\samples\wxpoem
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\wxpoem
         nmake -f makefile.vc FINAL=$(FINAL)

-!if "$(COMPIL)"==""

         cd $(WXDIR)\samples\wxsocket
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\wxsocket
         nmake -f makefile.vc FINAL=$(FINAL)

-!endif

 
 clean:
         cd $(WXDIR)\samples\bombs
 
 clean:
         cd $(WXDIR)\samples\bombs


@@ -194,6 +184,8 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\grid
         nmake -f makefile.vc clean
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\grid
         nmake -f makefile.vc clean

+        cd $(WXDIR)\samples\newgrid
+        nmake -f makefile.vc clean

         cd $(WXDIR)\samples\help
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\html
         cd $(WXDIR)\samples\help
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\html