X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2aef89b7a675805b601e757492c982031f38d21..520e470fdd0daef09c77938db642e4583933c90d:/src/makeb32.env diff --git a/src/makeb32.env b/src/makeb32.env index 2ecc973fdb..8e318d0536 100644 --- a/src/makeb32.env +++ b/src/makeb32.env @@ -4,7 +4,7 @@ WXDIR = $(WXWIN) CFG = $(WXDIR)\src\msw\wxwin32.cfg WXLIBDIR = $(WXDIR)\lib WXINC = $(WXDIR)\include -WIN95FLAG = -D__WIN95__ +WIN95FLAG = -D__WIN95__ -D__WINDOWS__ !ifndef FINAL FINAL=0 @@ -17,9 +17,44 @@ DEBUG_FLAGS= -v -DWXDEBUG=1 -D__WXDEBUG__ -DUSE_DEFINE OPT = -O2 DEBUG_FLAGS = -DUSE_DEFINE !endif -CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) -LIBTARGET= $(WXLIBDIR)\wx32.lib +!ifndef DLL +DLL=0 +!endif + +# Target WXMAKINGDLL WXUSINGDLL WXBUILDDLL +# wxWin DLL 1 0 1 +# wxWin STATIC 0 0 0 +# App use wxWin DLL 0 1 0 +# DLL use wxWin DLL 0 1 1 +# DLL use wxWin STATIC 0 0 1 +# + +!if "$(WXMAKINGDLL)" == "1" +DLL_FLAGS= -DWXMAKINGDLL=1 -D_WINDLL +WXLIB= $(WXLIBDIR)\wx200.lib + +!else + +LINK_FLAGS= /Tpe /ap /c + +!if "$(WXUSINGDLL)" == "1" +DLL_FLAGS= -DWXUSINGDLL=1 +WXLIB= $(WXLIBDIR)\wx200.lib +!else +DLL_FLAGS= +WXLIB= $(WXLIBDIR)\wx32.lib +!endif + +!endif + +!if "$(WXBUILDDLL)" == "1" +DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL +LINK_FLAGS= /Tpd /ap /c +!endif + +CPPFLAGS=$(DLL_FLAGS) @$(CFG) + DUMMY=dummy SRCSUFF = cpp