projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove hard TABs from 3rd party files in src directory.
[wxWidgets.git]
/
utils
/
execmon
/
makefile.vc
diff --git
a/utils/execmon/makefile.vc
b/utils/execmon/makefile.vc
index de7e4e82fc6f7bb3a20eba5087d1e31e5ccc94ff..907c51e394ade7603dcd5c37307a6ad8c3396ee9 100644
(file)
--- a/
utils/execmon/makefile.vc
+++ b/
utils/execmon/makefile.vc
@@
-23,9
+23,9
@@
SETUPHDIR = \
EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
\r
$(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(____DEBUGRUNTIME_3_p) \
\r
$(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
\r
EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
\r
$(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(____DEBUGRUNTIME_3_p) \
\r
$(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
\r
- $(__DEBUG_DEFINE_p) $(__
EXCEPTIONS_DEFINE_p) $(__RTTI
_DEFINE_p) \
\r
- $(__
THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU
_DEFINE_p) \
\r
- $(__
GFXCTX
_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
\r
+ $(__DEBUG_DEFINE_p) $(__
NDEBUG_DEFINE_p) $(__EXCEPTIONS
_DEFINE_p) \
\r
+ $(__
RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE
_DEFINE_p) \
\r
+ $(__
MSLU
_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
\r
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
\r
/DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \
\r
$(CXXFLAGS)
\r
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
\r
/DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \
\r
$(CXXFLAGS)
\r
@@
-208,6
+208,12
@@
__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
!if "$(DEBUG_FLAG)" == "0"
\r
__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
\r
!endif
\r
!if "$(DEBUG_FLAG)" == "0"
\r
__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
\r
!endif
\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
\r
+__NDEBUG_DEFINE_p = /DNDEBUG
\r
+!endif
\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
\r
+__NDEBUG_DEFINE_p = /DNDEBUG
\r
+!endif
\r
!if "$(USE_EXCEPTIONS)" == "0"
\r
__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
\r
!endif
\r
!if "$(USE_EXCEPTIONS)" == "0"
\r
__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
\r
!endif
\r
@@
-226,9
+232,6
@@
__UNICODE_DEFINE_p = /D_UNICODE
!if "$(MSLU)" == "1"
\r
__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
\r
!endif
\r
!if "$(MSLU)" == "1"
\r
__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
\r
!endif
\r
-!if "$(USE_GDIPLUS)" == "1"
\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
\r
-!endif
\r
!if "$(USE_CAIRO)" == "1"
\r
____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
\r
!endif
\r
!if "$(USE_CAIRO)" == "1"
\r
____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
\r
!endif
\r
@@
-246,9
+249,6
@@
__WXLIB_MONO_p = \
!if "$(MSLU)" == "1"
\r
__UNICOWS_LIB_p = unicows.lib
\r
!endif
\r
!if "$(MSLU)" == "1"
\r
__UNICOWS_LIB_p = unicows.lib
\r
!endif
\r
-!if "$(USE_GDIPLUS)" == "1"
\r
-__GDIPLUS_LIB_p = gdiplus.lib
\r
-!endif
\r
!if "$(USE_CAIRO)" == "1"
\r
__CAIRO_LIB_p = cairo.lib
\r
!endif
\r
!if "$(USE_CAIRO)" == "1"
\r
__CAIRO_LIB_p = cairo.lib
\r
!endif
\r
@@
-276,7
+276,7
@@
clean:
!if "$(USE_XRC)" == "1"
\r
$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
\r
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
\r
!if "$(USE_XRC)" == "1"
\r
$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
\r
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
\r
- $(EXECMON_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__
GDIPLUS_LIB_p) $(__
CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
\r
+ $(EXECMON_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
\r
<<
\r
!endif
\r
\r
<<
\r
!endif
\r
\r