updated i18n sample, french translations are now in the "fr" subdirectory.

[wxWidgets.git] / src / ntwxwin.mak

diff --git a/src/ntwxwin.mak b/src/ntwxwin.mak
index 05c19284cfe0bfec71cb1df8a96e4e09c914de53..18ec6b8f64daaa0027a412f6459ae019ba677c38 100644 (file)
--- a/src/ntwxwin.mak
+++ b/src/ntwxwin.mak
@@ -29,9 +29,10 @@ CPU=i386
 OBJSUFF=obj
 SRCSUFF=cpp
 
 OBJSUFF=obj
 SRCSUFF=cpp
 

+# If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally

 WINFLAGS=-c -W3 -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
 #WINLINKFLAGS=/NODEFAULTLIB /INCREMENTAL:NO /NOLOGO -align:0x1000 -machine:$(CPU) -subsystem:windows,$(APPVER)
 WINFLAGS=-c -W3 -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
 #WINLINKFLAGS=/NODEFAULTLIB /INCREMENTAL:NO /NOLOGO -align:0x1000 -machine:$(CPU) -subsystem:windows,$(APPVER)

-WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -align:0x1000 -machine:$(CPU) -subsystem:windows,$(APPVER)
+WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)

 #WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib libc.lib oldnames.lib\
 # comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib # libci.lib # libci.lib required for VC++ 4.2
 WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\
 #WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib libc.lib oldnames.lib\
 # comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib # libci.lib # libci.lib required for VC++ 4.2
 WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\


@@ -99,7 +100,7 @@ EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN
 !endif
 
 INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC)
 !endif
 
 INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC)

-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS)
+LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib

 
 !ifndef FINAL
 FINAL=0
 
 !ifndef FINAL
 FINAL=0


@@ -111,7 +112,9 @@ DLL=0
 !endif
 
 # Set this to 1 if you don't want to use precompiled headers
 !endif
 
 # Set this to 1 if you don't want to use precompiled headers

+!ifndef NOPCH

 NOPCH=0
 NOPCH=0

+!endif

 
 MAKEPRECOMP=/YcWX/WXPREC.H
 OPTIONS=
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 OPTIONS=


@@ -119,14 +122,16 @@ OPTIONS=
 !if "$(FINAL)" == "0"
 OPT = /Od /Gy
 # ***N.B.*** to save space/time, comment out /FR to avoid browse info (.sbr files) being generated
 !if "$(FINAL)" == "0"
 OPT = /Od /Gy
 # ***N.B.*** to save space/time, comment out /FR to avoid browse info (.sbr files) being generated

-DEBUG_FLAGS= /Zi # /FR
+DEBUG_FLAGS= /Zi /D__WXDEBUG__ # /DDEBUG=1 # /FR

 LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE
 LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE

+CRTFLAG=/MD

 !else
 # /O1 - smallest code
 # /O2 - fastest code
 OPT = /O1 # /O2 # /Od
 DEBUG_FLAGS=
 LINK_DEBUG_FLAGS=/RELEASE
 !else
 # /O1 - smallest code
 # /O2 - fastest code
 OPT = /O1 # /O2 # /Od
 DEBUG_FLAGS=
 LINK_DEBUG_FLAGS=/RELEASE

+CRTFLAG=/MD

 !endif
 
 !if "$(DLL)" == "0"
 !endif
 
 !if "$(DLL)" == "0"


@@ -141,9 +146,9 @@ PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 

-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(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__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS)

 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
 DUMMY=dummy
 
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
 DUMMY=dummy
 


@@ -158,11 +163,10 @@ DUMMY=dummy
 !endif
 
 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
 !endif
 
 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb

-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL /MT $(EXTRADLLFLAGS) /D_WINDOWS /D_WINDLL
-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL /MT $(EXTRADLLFLAGS) /D_WINDOWS /D_WINDLL
+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\$(DUMMY).obj
 
 LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
 !endif
 
 DUMMYOBJ=$(WXDIR)\src\msw\$(DUMMY).obj
 

-