Fix the line endings to be CRLF after the property change.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-10-05 16:11:02 +00:00
parent 33820d9428
commit d9a35b5406

View File

@@ -1,184 +1,184 @@
# ========================================================================= # =========================================================================
# This makefile was generated by # This makefile was generated by
# Bakefile 0.2.6 (http://www.bakefile.org) # Bakefile 0.2.6 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten! # Do not modify, all changes will be overwritten!
# ========================================================================= # =========================================================================
include ../../build/msw/config.gcc include ../../build/msw/config.gcc
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# Do not modify the rest of this file! # Do not modify the rest of this file!
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
### Variables: ### ### Variables: ###
CPPDEPS = -MT$@ -MF$@.d -MD -MP CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
EXECMON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ EXECMON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
$(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
EXECMON_OBJECTS = \ EXECMON_OBJECTS = \
$(OBJS)\execmon_execmon.o $(OBJS)\execmon_execmon.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
ifeq ($(USE_GUI),0) ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = msw PORTNAME = msw
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
endif endif
ifeq ($(UNICODE),1) ifeq ($(UNICODE),1)
WXUNICODEFLAG = u WXUNICODEFLAG = u
endif endif
ifeq ($(WXUNIV),1) ifeq ($(WXUNIV),1)
WXUNIVNAME = univ WXUNIVNAME = univ
endif endif
ifeq ($(SHARED),1) ifeq ($(SHARED),1)
WXDLLFLAG = dll WXDLLFLAG = dll
endif endif
ifeq ($(SHARED),0) ifeq ($(SHARED),0)
LIBTYPE_SUFFIX = lib LIBTYPE_SUFFIX = lib
endif endif
ifeq ($(SHARED),1) ifeq ($(SHARED),1)
LIBTYPE_SUFFIX = dll LIBTYPE_SUFFIX = dll
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(USE_XRC),1) ifeq ($(USE_XRC),1)
__execmon___depname = $(OBJS)\execmon.exe __execmon___depname = $(OBJS)\execmon.exe
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
ifeq ($(BUILD),release) ifeq ($(BUILD),release)
__OPTIMIZEFLAG_2 = -O2 __OPTIMIZEFLAG_2 = -O2
endif endif
ifeq ($(USE_RTTI),0) ifeq ($(USE_RTTI),0)
__RTTIFLAG_5 = -fno-rtti __RTTIFLAG_5 = -fno-rtti
endif endif
ifeq ($(USE_RTTI),1) ifeq ($(USE_RTTI),1)
__RTTIFLAG_5 = __RTTIFLAG_5 =
endif endif
ifeq ($(USE_EXCEPTIONS),0) ifeq ($(USE_EXCEPTIONS),0)
__EXCEPTIONSFLAG_6 = -fno-exceptions __EXCEPTIONSFLAG_6 = -fno-exceptions
endif endif
ifeq ($(USE_EXCEPTIONS),1) ifeq ($(USE_EXCEPTIONS),1)
__EXCEPTIONSFLAG_6 = __EXCEPTIONSFLAG_6 =
endif endif
ifeq ($(WXUNIV),1) ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
endif endif
ifeq ($(DEBUG_FLAG),0) ifeq ($(DEBUG_FLAG),0)
__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
endif endif
ifeq ($(USE_EXCEPTIONS),0) ifeq ($(USE_EXCEPTIONS),0)
__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
endif endif
ifeq ($(USE_RTTI),0) ifeq ($(USE_RTTI),0)
__RTTI_DEFINE_p = -DwxNO_RTTI __RTTI_DEFINE_p = -DwxNO_RTTI
endif endif
ifeq ($(USE_THREADS),0) ifeq ($(USE_THREADS),0)
__THREAD_DEFINE_p = -DwxNO_THREADS __THREAD_DEFINE_p = -DwxNO_THREADS
endif endif
ifeq ($(UNICODE),0) ifeq ($(UNICODE),0)
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
endif endif
ifeq ($(UNICODE),1) ifeq ($(UNICODE),1)
__UNICODE_DEFINE_p = -D_UNICODE __UNICODE_DEFINE_p = -D_UNICODE
endif endif
ifeq ($(MSLU),1) ifeq ($(MSLU),1)
__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
endif endif
ifeq ($(USE_GDIPLUS),1) ifeq ($(USE_GDIPLUS),1)
__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 __GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
endif endif
ifeq ($(SHARED),1) ifeq ($(SHARED),1)
__DLLFLAG_p = -DWXUSINGDLL __DLLFLAG_p = -DWXUSINGDLL
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MSLU),1) ifeq ($(MSLU),1)
__UNICOWS_LIB_p = -lunicows __UNICOWS_LIB_p = -lunicows
endif endif
ifeq ($(USE_GDIPLUS),1) ifeq ($(USE_GDIPLUS),1)
__GDIPLUS_LIB_p = -lgdiplus __GDIPLUS_LIB_p = -lgdiplus
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
ifeq ($(DEBUG_INFO),default) ifeq ($(DEBUG_INFO),default)
__DEBUGINFO = -g __DEBUGINFO = -g
endif endif
endif endif
ifeq ($(BUILD),release) ifeq ($(BUILD),release)
ifeq ($(DEBUG_INFO),default) ifeq ($(DEBUG_INFO),default)
__DEBUGINFO = __DEBUGINFO =
endif endif
endif endif
ifeq ($(DEBUG_INFO),0) ifeq ($(DEBUG_INFO),0)
__DEBUGINFO = __DEBUGINFO =
endif endif
ifeq ($(DEBUG_INFO),1) ifeq ($(DEBUG_INFO),1)
__DEBUGINFO = -g __DEBUGINFO = -g
endif endif
ifeq ($(USE_THREADS),0) ifeq ($(USE_THREADS),0)
__THREADSFLAG = __THREADSFLAG =
endif endif
ifeq ($(USE_THREADS),1) ifeq ($(USE_THREADS),1)
__THREADSFLAG = -mthreads __THREADSFLAG = -mthreads
endif endif
all: $(OBJS) all: $(OBJS)
$(OBJS): $(OBJS):
-if not exist $(OBJS) mkdir $(OBJS) -if not exist $(OBJS) mkdir $(OBJS)
### Targets: ### ### Targets: ###
all: $(__execmon___depname) all: $(__execmon___depname)
clean: clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
ifeq ($(USE_XRC),1) ifeq ($(USE_XRC),1)
$(OBJS)\execmon.exe: $(EXECMON_OBJECTS) $(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
$(CXX) -o $@ $(EXECMON_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(EXECMON_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
endif endif
$(OBJS)\execmon_execmon.o: ./execmon.cpp $(OBJS)\execmon_execmon.o: ./execmon.cpp
$(CXX) -c -o $@ $(EXECMON_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(EXECMON_CXXFLAGS) $(CPPDEPS) $<
.PHONY: all clean .PHONY: all clean
SHELL := $(COMSPEC) SHELL := $(COMSPEC)
# Dependencies tracking: # Dependencies tracking:
-include $(OBJS)/*.d -include $(OBJS)/*.d