added precomp-headers-exclude (DSP files only so far) and fixed dependencies for...

[wxWidgets.git] / samples / console / makefile.vc

diff --git a/samples/console/makefile.vc b/samples/console/makefile.vc
index 7d03cdcdbd8b7c57a4f3974569de4845f96a49a1..13c821940524c0154951dcc1c776db961dfe2cd8 100644 (file)
--- a/samples/console/makefile.vc
+++ b/samples/console/makefile.vc
@@ -4,37 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-
-# -------------------------------------------------------------------------
-# These are configurable options:
-# -------------------------------------------------------------------------
-
-# Type of compiled binaries [debug,release]
-BUILD = release
-# Name of your custom configuration. This affects directory
-#            where object files are stored as well as the location of
-#            compiled .lib files and setup.h under the lib/ toplevel directory. 
-CFG = 
-# Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS = /DWIN32 /D_WINDOWS
-# C++ compiler 
-CXX = cl
-# Standard flags for C++ 
-CXXFLAGS = 
-# Standard linker flags 
-LDFLAGS = 
-# Multiple libraries or single huge monolithic one? [0,1]
-MONOLITHIC = 1
-# Is this official build by wxWindows developers? [0,1]
-OFFICIAL_BUILD = 0
-# What type of library to build? [0,1]
-SHARED = 1
-# Compile Unicode build of wxWindows? [0,1]
-UNICODE = 0
-# Build GUI libraries? [0,1]
-USE_GUI = 1
-# Build wxUniversal instead of native port? [0,1]
-WXUNIV = 0
+!include <../../build/config.vc>
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -42,8 +12,8 @@ WXUNIV = 0
 
 ### Variables: ###
 
+CONSOLE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_2) /DWIN32 $(__DEBUGFLAG_0) /Fd$(OBJS)\console.pdb $(____DEBUGFLAG_3_p) $(__OPTIMIZEFLAG_4)  /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib  /I.\..\..\src\regex /I.\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_CONSOLE $(__MULTILIB_FLAG_p) $(CXXFLAGS)
 OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-CONSOLE_CXXFLAGS = $(CPPFLAGS) /MD$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\console.pdb $(__OPTIMIZEFLAG_3)  /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib  /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS)
 
 ### Conditionally set variables: ###
 
@@ -93,10 +63,16 @@ __DLLFLAG_p = /DWXUSINGDLL
 __MULTILIB_FLAG_p = /DwxUSE_GUI=0
 !endif
 !if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_3 = /Od
+__OPTIMIZEFLAG_4 = /Od
 !endif
 !if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_3 = /O2
+__OPTIMIZEFLAG_4 = /O2
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = T
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
@@ -110,6 +86,12 @@ __WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 !endif
+!if "$(BUILD)" == "debug"
+____DEBUGFLAG_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release"
+____DEBUGFLAG_3_p = /DNDEBUG
+!endif
 
 
 all: $(OBJS)
@@ -129,14 +111,10 @@ clean:
        -if exist $(OBJS)\console.exe del $(OBJS)\console.exe
 
 $(OBJS)\console.exe: $(OBJS)\console_console.obj
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:CONSOLE @<<
-       $(OBJS)\console_console.obj  $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
+       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:CONSOLE  @<<
+       $(OBJS)\console_console.obj  $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
 <<
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
        for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-install: all
-
-uninstall: