moved common code from ctor and Create() to a separate Init() function

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

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 0491be8b28754fb547b8039af7b935db7ac3d54f..ae581ed5f86c351641d58b26a215ad57af3e4eb2 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -21,9 +21,10 @@
 WXDIR = $(WXWIN)
 
 # Set all these to 1 if you want to build a dynamic library
 WXDIR = $(WXWIN)
 
 # Set all these to 1 if you want to build a dynamic library

-#DLL=1
-#WXMAKINGDLL=1
-#WXBUILDDLL=1
+!if "$(DLL)" == "1"
+WXMAKINGDLL=1
+WXBUILDDLL=1
+!endif

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


@@ -75,16 +76,19 @@ GENERICOBJS= \
   $(MSWDIR)\fontdlgg.obj \
   $(MSWDIR)\gridg.obj \
   $(MSWDIR)\helpxlp.obj \
   $(MSWDIR)\fontdlgg.obj \
   $(MSWDIR)\gridg.obj \
   $(MSWDIR)\helpxlp.obj \

+  $(MSWDIR)\laywin.obj \

   $(MSWDIR)\msgdlgg.obj \
   $(MSWDIR)\panelg.obj \
   $(MSWDIR)\msgdlgg.obj \
   $(MSWDIR)\panelg.obj \

-  $(MSWDIR)\printps.obj \
-  $(MSWDIR)\prntdlgg.obj \
+  $(MSWDIR)\sashwin.obj \

   $(MSWDIR)\scrolwin.obj \
   $(MSWDIR)\splitter.obj \
   $(MSWDIR)\statusbr.obj \
   $(MSWDIR)\tabg.obj \
   $(MSWDIR)\textdlgg.obj
 
   $(MSWDIR)\scrolwin.obj \
   $(MSWDIR)\splitter.obj \
   $(MSWDIR)\statusbr.obj \
   $(MSWDIR)\tabg.obj \
   $(MSWDIR)\textdlgg.obj
 

+#  $(MSWDIR)\printps.obj \
+#  $(MSWDIR)\prntdlgg.obj \
+

 COMMONOBJS = \
   $(MSWDIR)\config.obj \
   $(MSWDIR)\cmndata.obj \
 COMMONOBJS = \
   $(MSWDIR)\config.obj \
   $(MSWDIR)\cmndata.obj \


@@ -115,6 +119,7 @@ COMMONOBJS = \
   $(MSWDIR)\utilscmn.obj \
   $(MSWDIR)\validate.obj \
   $(MSWDIR)\valtext.obj \
   $(MSWDIR)\utilscmn.obj \
   $(MSWDIR)\validate.obj \
   $(MSWDIR)\valtext.obj \

+  $(MSWDIR)\variant.obj \

   $(MSWDIR)\date.obj \
   $(MSWDIR)\hash.obj \
   $(MSWDIR)\list.obj \
   $(MSWDIR)\date.obj \
   $(MSWDIR)\hash.obj \
   $(MSWDIR)\list.obj \


@@ -123,7 +128,7 @@ COMMONOBJS = \
   $(MSWDIR)\wxexpr.obj \
   $(MSWDIR)\y_tab.obj \
   $(MSWDIR)\stream.obj \
   $(MSWDIR)\wxexpr.obj \
   $(MSWDIR)\y_tab.obj \
   $(MSWDIR)\stream.obj \

-  $(MSWDIR)\fstream.obj \
+  $(MSWDIR)\wfstream.obj \

   $(MSWDIR)\mstream.obj \
   $(MSWDIR)\zstream.obj \
   $(MSWDIR)\datstrm.obj \
   $(MSWDIR)\mstream.obj \
   $(MSWDIR)\zstream.obj \
   $(MSWDIR)\datstrm.obj \


@@ -524,6 +529,8 @@ $(MSWDIR)\list.obj:     $(COMMDIR)\list.$(SRCSUFF)
 
 $(MSWDIR)\string.obj:     $(COMMDIR)\string.$(SRCSUFF)
 
 
 $(MSWDIR)\string.obj:     $(COMMDIR)\string.$(SRCSUFF)
 

+$(MSWDIR)\variant.obj:     $(COMMDIR)\variant.$(SRCSUFF)
+

 $(MSWDIR)\matrix.obj:     $(COMMDIR)\matrix.$(SRCSUFF)
 
 $(MSWDIR)\time.obj:     $(COMMDIR)\time.$(SRCSUFF)
 $(MSWDIR)\matrix.obj:     $(COMMDIR)\matrix.$(SRCSUFF)
 
 $(MSWDIR)\time.obj:     $(COMMDIR)\time.$(SRCSUFF)


@@ -536,7 +543,7 @@ $(MSWDIR)\mstream.obj:      $(COMMDIR)\mstream.$(SRCSUFF)
 
 $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 
 
 $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 

-$(MSWDIR)\fstream.obj: $(COMMDIR)\fstream.$(SRCSUFF)
+$(MSWDIR)\wfstream.obj:        $(COMMDIR)\wfstream.$(SRCSUFF)

 
 $(MSWDIR)\stream.obj:  $(COMMDIR)\stream.$(SRCSUFF)
 
 
 $(MSWDIR)\stream.obj:  $(COMMDIR)\stream.$(SRCSUFF)
 


@@ -578,6 +585,8 @@ $(MSWDIR)\gridg.obj:     $(GENDIR)\gridg.$(SRCSUFF)
 
 $(MSWDIR)\helpxlp.obj:     $(GENDIR)\helpxlp.$(SRCSUFF)
 
 
 $(MSWDIR)\helpxlp.obj:     $(GENDIR)\helpxlp.$(SRCSUFF)
 

+$(MSWDIR)\laywin.obj:     $(GENDIR)\laywin.$(SRCSUFF)
+

 $(MSWDIR)\msgdlgg.obj:     $(GENDIR)\msgdlgg.$(SRCSUFF)
 
 $(MSWDIR)\panelg.obj:     $(GENDIR)\panelg.$(SRCSUFF)
 $(MSWDIR)\msgdlgg.obj:     $(GENDIR)\msgdlgg.$(SRCSUFF)
 
 $(MSWDIR)\panelg.obj:     $(GENDIR)\panelg.$(SRCSUFF)


@@ -586,6 +595,8 @@ $(MSWDIR)\printps.obj:     $(GENDIR)\printps.$(SRCSUFF)
 
 $(MSWDIR)\prntdlgg.obj:     $(GENDIR)\prntdlgg.$(SRCSUFF)
 
 
 $(MSWDIR)\prntdlgg.obj:     $(GENDIR)\prntdlgg.$(SRCSUFF)
 

+$(MSWDIR)\sashwin.obj:     $(GENDIR)\sashwin.$(SRCSUFF)
+

 $(MSWDIR)\scrolwin.obj:     $(GENDIR)\scrolwin.$(SRCSUFF)
 
 $(MSWDIR)\splitter.obj:     $(GENDIR)\splitter.$(SRCSUFF)
 $(MSWDIR)\scrolwin.obj:     $(GENDIR)\scrolwin.$(SRCSUFF)
 
 $(MSWDIR)\splitter.obj:     $(GENDIR)\splitter.$(SRCSUFF)