X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/341287bf49066e5dd84e971bd508ee3919ff4b46..5b6ec9803a058368a1b240a22d444c7301c5715a:/src/msw/makefile.b32 diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 454bcdaeb3..ae581ed5f8 100644 --- 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 -#DLL=1 -#WXMAKINGDLL=1 -#WXBUILDDLL=1 +!if "$(DLL)" == "1" +WXMAKINGDLL=1 +WXBUILDDLL=1 +!endif !include $(WXDIR)\src\makeb32.env @@ -78,8 +79,6 @@ GENERICOBJS= \ $(MSWDIR)\laywin.obj \ $(MSWDIR)\msgdlgg.obj \ $(MSWDIR)\panelg.obj \ - $(MSWDIR)\printps.obj \ - $(MSWDIR)\prntdlgg.obj \ $(MSWDIR)\sashwin.obj \ $(MSWDIR)\scrolwin.obj \ $(MSWDIR)\splitter.obj \ @@ -87,6 +86,9 @@ GENERICOBJS= \ $(MSWDIR)\tabg.obj \ $(MSWDIR)\textdlgg.obj +# $(MSWDIR)\printps.obj \ +# $(MSWDIR)\prntdlgg.obj \ + COMMONOBJS = \ $(MSWDIR)\config.obj \ $(MSWDIR)\cmndata.obj \ @@ -126,7 +128,7 @@ COMMONOBJS = \ $(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 \ @@ -541,7 +543,7 @@ $(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(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)