the msw implementation even shows an ok button if it is not specified, we do the...

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index aa7e6e0d254f57288fb3e02b43b90b29d83b7069..78ed7bb272a4323229249f1e48c3dd26143f4be7 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -8,11 +8,15 @@
 #
 !include <ntwin32.mak>
 
 #
 !include <ntwin32.mak>
 

+# read version numbers
+!include "version.mak"
+WXVERSION=$(wxMAJOR_VERSION)$(wxMINOR_VERSION)$(wxRELEASE_NUMBER_IFUNSTABLE)
+

 !if "$(RM)" == ""
 RM= erase
 !endif
 
 !if "$(RM)" == ""
 RM= erase
 !endif
 

-WXVERSION=23_0
+# WIN95 means "all systems newer than Win95", i.e. Win9x and NT 4+

 WIN95=1
 
 !if "$(WIN95)" == "0"
 WIN95=1
 
 !if "$(WIN95)" == "0"


@@ -22,7 +26,7 @@ WIN95=1
 APPVER=3.50
 WINVERSION=-DWINVER=0x0350 # Generic WIN32
 !else
 APPVER=3.50
 WINVERSION=-DWINVER=0x0350 # Generic WIN32
 !else

-APPVER=3.50 # 4.0
+APPVER=4.0

 # This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0).
 WINVERSION=-DWINVER=0x0400 /D__WIN95__
 !endif
 # This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0).
 WINVERSION=-DWINVER=0x0400 /D__WIN95__
 !endif


@@ -37,12 +41,12 @@ SRCSUFF=cpp
 WAITFLAG=/w
 
 # If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally
 WAITFLAG=/w
 
 # If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally

-#WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
-WINFLAGS=-c -W3 -nologo -DWIN32 -D__WIN32__ -D_WINDOWS $(WINVERSION)
+#WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION) -DSTRICT
+WINFLAGS=-c -W3 -nologo -DWIN32 -D__WIN32__ -D_WINDOWS $(WINVERSION) -DSTRICT

 WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
 BASELINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:console,$(APPVER)
 WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\
 WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
 BASELINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:console,$(APPVER)
 WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\

- comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2
+ comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2

 
 # Set a WXWIN environment variable be the path to your WXWIN directory
 WXDIR=$(WXWIN)
 
 # Set a WXWIN environment variable be the path to your WXWIN directory
 WXDIR=$(WXWIN)


@@ -99,6 +103,14 @@ EXTRADLLFLAGS=
 EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN
 !endif
 
 EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN
 !endif
 

+!ifndef UNICODE
+UNICODE=0
+!endif
+
+!ifndef MSLU
+MSLU=0
+!endif
+

 !ifndef FINAL
 FINAL=0
 DEBUG=1
 !ifndef FINAL
 FINAL=0
 DEBUG=1


@@ -118,15 +130,20 @@ NOPCH=0
 # wx$(WXVERSION) (DLL release), wx$(WXVERSION)d (DLL debug)
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 # wx$(WXVERSION) (DLL release), wx$(WXVERSION)d (DLL debug)
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"

-WXLIBNAME=wx$(WXVERSION)
+WXLIBNAME=wxmsw$(WXVERSION)

 !else
 !else

-WXLIBNAME=wx
+WXLIBNAME=wxmsw

 !endif
 
 !if "$(NEW_WXLIBNAME)" != ""
 WXLIBNAME=$(NEW_WXLIBNAME)
 !endif
 
 !endif
 
 !if "$(NEW_WXLIBNAME)" != ""
 WXLIBNAME=$(NEW_WXLIBNAME)
 !endif
 

+!if "$(UNICODE)" == "1"
+UNIEXT=u
+WXLIBNAME=$(WXLIBNAME)$(UNIEXT)
+!endif
+

 !if "$(FINAL)" == "1"
 D=Release
 !else if "$(FINAL)" == "hybrid"
 !if "$(FINAL)" == "1"
 D=Release
 !else if "$(FINAL)" == "hybrid"


@@ -145,21 +162,42 @@ WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
 !if "$(wxUSE_GUI)" == "0"
 WXLIBNAME=wxBase
 D=Base$(D)
 !if "$(wxUSE_GUI)" == "0"
 WXLIBNAME=wxBase
 D=Base$(D)

-WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
+WXLIBNAME=$(WXLIBNAME)$(UNIEXT)$(LIBEXT)

 !endif
 
 !endif
 

+!if "$(UNICODE)" == "1"
+D=$(D)Unicode
+!endif
+
+INCEXT=$(UNIEXT)$(LIBEXT)
+

 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 D=$(D)DLL
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 D=$(D)DLL

+INCEXT=dll$(INCEXT)
+!endif
+
+#----------------------------------------------------------------------
+# MSLU == Microsoft Layer for Unicode
+# See MSDN or the Platform SDK docs for details
+!if "$(MSLU)" == "1"
+MSLU_FLAGS=/nod:kernel32.lib /nod:advapi32.lib /nod:user32.lib /nod:gdi32.lib /nod:shell32.lib /nod:comdlg32.lib /nod:version.lib /nod:mpr.lib /nod:rasapi32.lib /nod:winmm.lib /nod:winspool.lib /nod:vfw32.lib /nod:secur32.lib /nod:oleacc.lib /nod:oledlg.lib /nod:sensapi.lib
+MSLU_LIBS=$(MSLU_FLAGS) unicows.lib

 !endif
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
 !endif
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 

-INC=$(EXTRAINC) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff
+!if "$(wxUSE_GUI)" == "0"
+INCTEMP=$(EXTRAINC) -I$(WXDIR)/lib/base$(INCEXT)
+!else
+INCTEMP=$(EXTRAINC) -I$(WXDIR)/lib/msw$(INCEXT)
+!endif
+
+INC=$(INCTEMP) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff

 
 !if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"
 
 !if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"

-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS)
+LIBS = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib

 !else
 !else

-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
+LIBS = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib

 !endif
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
 MAKEPRECOMP=/YcWX/WXPREC.H


@@ -173,9 +211,9 @@ LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE
 _CRTFLAG=/MDd
 
 !else if "$(FINAL)" == "hybrid"
 _CRTFLAG=/MDd
 
 !else if "$(FINAL)" == "hybrid"

-OPT = /Od /Gy
-DEBUG_FLAGS= /Zi /D__WXDEBUG__ /D__NO_VC_CRTDBG__
-LINK_DEBUG_FLAGS=-debug:full -debugtype:cv
+OPT = /Ox /Gy
+DEBUG_FLAGS= /D__WXDEBUG__ /D__NO_VC_CRTDBG__
+LINK_DEBUG_FLAGS=/RELEASE

 _CRTFLAG=/MD
 
 !else
 _CRTFLAG=/MD
 
 !else


@@ -199,22 +237,22 @@ PCH=
 PRECOMP=
 MAKEPRECOMP=
 !else
 PRECOMP=
 MAKEPRECOMP=
 !else

-  
+

 !if "$(wxUSE_GUI)" == "0"
 PCH=wxBase.pch
 !else
 !if "$(wxUSE_GUI)" == "0"
 PCH=wxBase.pch
 !else

-PCH=wxvc.pch
+PCH=wxWindows.pch

 !endif
 !endif

-  
-PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$D\vc60.pdb
+
+PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\$D\$(PCH) /Fd$(WXDIR)\$D\vc60.pdb

 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 

-   

 
 

-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS)
+
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /D__WINDOWS__ /GX- $(OVERRIDEFLAGS)

 # If you don't include wxprec.h, use CPPFLAGS2
 # If you don't include wxprec.h, use CPPFLAGS2

-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS)
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX- $(OVERRIDEFLAGS)

 !if "$(wxUSE_GUI)" == "0"
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS)
 !else
 !if "$(wxUSE_GUI)" == "0"
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS)
 !else


@@ -225,20 +263,20 @@ DUMMY=dummy
 !else
 
 !if "$(WXMAKINGDLL)" == "1"
 !else
 
 !if "$(WXMAKINGDLL)" == "1"

-PCH=wxvc.pch
+PCH=wxWindows.pch

 DUMMY=dummydll
 !else
 DUMMY=dummydll
 !else

-PCH=wxvc.pch
+PCH=wxWindows.pch

 DUMMY=dummy
 !endif
 
 DUMMY=dummy
 !endif
 

-PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb
+PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\$D\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb

 CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
 CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
 LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
 !endif
 
 CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
 CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
 LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
 !endif
 

-DUMMYOBJ=$(WXDIR)\src\msw\$D\$(DUMMY).obj
+DUMMYOBJ=$(WXDIR)\$D\$(DUMMY).obj

 
 .c.obj:
        cl @<<
 
 .c.obj:
        cl @<<