Commit
This completes the changes of c3e5751.
- Loading branch information
There are no files selected for viewing
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,193 +1,193 @@ | ||
# ========================================================================= | ||
# This makefile was generated by | ||
# Bakefile 0.2.9 (http://www.bakefile.org) | ||
# Do not modify, all changes will be overwritten! | ||
# ========================================================================= | ||
include ../../build/msw/config.gcc | ||
# ------------------------------------------------------------------------- | ||
# Do not modify the rest of this file! | ||
# ------------------------------------------------------------------------- | ||
### Variables: ### | ||
CPPDEPS = -MT$@ -MF$@.d -MD -MP | ||
WX_RELEASE_NODOT = 31 | ||
COMPILER_PREFIX = gcc | ||
OBJS = \ | ||
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||
LIBDIRNAME = \ | ||
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) | ||
SETUPHDIR = \ | ||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||
CONSOLE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ | ||
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ | ||
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ | ||
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ | ||
-I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \ | ||
-Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ | ||
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) | ||
CONSOLE_OBJECTS = \ | ||
$(OBJS)\console_console.o | ||
### Conditionally set variables: ### | ||
ifeq ($(GCC_VERSION),2.95) | ||
GCCFLAGS = -fvtable-thunks | ||
endif | ||
ifeq ($(USE_GUI),0) | ||
PORTNAME = base | ||
endif | ||
ifeq ($(USE_GUI),1) | ||
PORTNAME = msw$(TOOLKIT_VERSION) | ||
endif | ||
ifeq ($(OFFICIAL_BUILD),1) | ||
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD | ||
endif | ||
ifeq ($(BUILD),debug) | ||
WXDEBUGFLAG = d | ||
endif | ||
ifeq ($(UNICODE),1) | ||
WXUNICODEFLAG = u | ||
endif | ||
ifeq ($(WXUNIV),1) | ||
WXUNIVNAME = univ | ||
endif | ||
ifeq ($(SHARED),1) | ||
WXDLLFLAG = dll | ||
endif | ||
ifeq ($(SHARED),0) | ||
LIBTYPE_SUFFIX = lib | ||
endif | ||
ifeq ($(SHARED),1) | ||
LIBTYPE_SUFFIX = dll | ||
endif | ||
ifeq ($(MONOLITHIC),0) | ||
EXTRALIBS_FOR_BASE = | ||
endif | ||
ifeq ($(MONOLITHIC),1) | ||
EXTRALIBS_FOR_BASE = | ||
endif | ||
ifeq ($(BUILD),debug) | ||
__OPTIMIZEFLAG_2 = -O0 | ||
endif | ||
ifeq ($(BUILD),release) | ||
__OPTIMIZEFLAG_2 = -O2 | ||
endif | ||
ifeq ($(USE_RTTI),0) | ||
__RTTIFLAG_5 = -fno-rtti | ||
endif | ||
ifeq ($(USE_RTTI),1) | ||
__RTTIFLAG_5 = | ||
endif | ||
ifeq ($(USE_EXCEPTIONS),0) | ||
__EXCEPTIONSFLAG_6 = -fno-exceptions | ||
endif | ||
ifeq ($(USE_EXCEPTIONS),1) | ||
__EXCEPTIONSFLAG_6 = | ||
endif | ||
ifeq ($(WXUNIV),1) | ||
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ | ||
endif | ||
ifeq ($(DEBUG_FLAG),0) | ||
__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 | ||
endif | ||
ifeq ($(BUILD),release) | ||
__NDEBUG_DEFINE_p = -DNDEBUG | ||
endif | ||
ifeq ($(USE_EXCEPTIONS),0) | ||
__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | ||
endif | ||
ifeq ($(USE_RTTI),0) | ||
__RTTI_DEFINE_p = -DwxNO_RTTI | ||
endif | ||
ifeq ($(USE_THREADS),0) | ||
__THREAD_DEFINE_p = -DwxNO_THREADS | ||
endif | ||
ifeq ($(UNICODE),0) | ||
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 | ||
endif | ||
ifeq ($(UNICODE),1) | ||
__UNICODE_DEFINE_p = -D_UNICODE | ||
endif | ||
ifeq ($(USE_CAIRO),1) | ||
____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo | ||
endif | ||
ifeq ($(SHARED),1) | ||
__DLLFLAG_p = -DWXUSINGDLL | ||
endif | ||
ifeq ($(MONOLITHIC),0) | ||
__WXLIB_NET_p = \ | ||
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net | ||
endif | ||
ifeq ($(MONOLITHIC),0) | ||
__WXLIB_BASE_p = \ | ||
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) | ||
endif | ||
ifeq ($(MONOLITHIC),1) | ||
__WXLIB_MONO_p = \ | ||
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) | ||
endif | ||
ifeq ($(MONOLITHIC),1) | ||
__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) | ||
endif | ||
ifeq ($(USE_GUI),1) | ||
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) | ||
endif | ||
ifeq ($(USE_CAIRO),1) | ||
__CAIRO_LIB_p = -lcairo | ||
endif | ||
ifeq ($(USE_CAIRO),1) | ||
____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib | ||
endif | ||
ifeq ($(BUILD),debug) | ||
ifeq ($(DEBUG_INFO),default) | ||
__DEBUGINFO = -g | ||
endif | ||
endif | ||
ifeq ($(BUILD),release) | ||
ifeq ($(DEBUG_INFO),default) | ||
__DEBUGINFO = | ||
endif | ||
endif | ||
ifeq ($(DEBUG_INFO),0) | ||
__DEBUGINFO = | ||
endif | ||
ifeq ($(DEBUG_INFO),1) | ||
__DEBUGINFO = -g | ||
endif | ||
ifeq ($(USE_THREADS),0) | ||
__THREADSFLAG = | ||
endif | ||
ifeq ($(USE_THREADS),1) | ||
__THREADSFLAG = -mthreads | ||
endif | ||
all: $(OBJS) | ||
$(OBJS): | ||
-if not exist $(OBJS) mkdir $(OBJS) | ||
### Targets: ### | ||
all: $(OBJS)\console.exe | ||
clean: | ||
-if exist $(OBJS)\*.o del $(OBJS)\*.o | ||
-if exist $(OBJS)\*.d del $(OBJS)\*.d | ||
-if exist $(OBJS)\console.exe del $(OBJS)\console.exe | ||
$(OBJS)\console.exe: $(CONSOLE_OBJECTS) | ||
$(CXX) -o $@ $(CONSOLE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet | ||
$(OBJS)\console_console.o: ./console.cpp | ||
$(CXX) -c -o $@ $(CONSOLE_CXXFLAGS) $(CPPDEPS) $< | ||
.PHONY: all clean | ||
SHELL := $(COMSPEC) | ||
# Dependencies tracking: | ||
-include $(OBJS)/*.d | ||
# ========================================================================= | ||
# This makefile was generated by | ||
# Bakefile 0.2.9 (http://www.bakefile.org) | ||
# Do not modify, all changes will be overwritten! | ||
# ========================================================================= | ||
|
||
include ../../build/msw/config.gcc | ||
|
||
# ------------------------------------------------------------------------- | ||
# Do not modify the rest of this file! | ||
# ------------------------------------------------------------------------- | ||
|
||
### Variables: ### | ||
|
||
CPPDEPS = -MT$@ -MF$@.d -MD -MP | ||
WX_RELEASE_NODOT = 31 | ||
COMPILER_PREFIX = gcc | ||
OBJS = \ | ||
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||
LIBDIRNAME = \ | ||
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) | ||
SETUPHDIR = \ | ||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||
CONSOLE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ | ||
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ | ||
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ | ||
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ | ||
-I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \ | ||
-Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ | ||
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) | ||
CONSOLE_OBJECTS = \ | ||
$(OBJS)\console_console.o | ||
|
||
### Conditionally set variables: ### | ||
|
||
ifeq ($(GCC_VERSION),2.95) | ||
GCCFLAGS = -fvtable-thunks | ||
endif | ||
ifeq ($(USE_GUI),0) | ||
PORTNAME = base | ||
endif | ||
ifeq ($(USE_GUI),1) | ||
PORTNAME = msw$(TOOLKIT_VERSION) | ||
endif | ||
ifeq ($(OFFICIAL_BUILD),1) | ||
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD | ||
endif | ||
ifeq ($(BUILD),debug) | ||
WXDEBUGFLAG = d | ||
endif | ||
ifeq ($(UNICODE),1) | ||
WXUNICODEFLAG = u | ||
endif | ||
ifeq ($(WXUNIV),1) | ||
WXUNIVNAME = univ | ||
endif | ||
ifeq ($(SHARED),1) | ||
WXDLLFLAG = dll | ||
endif | ||
ifeq ($(SHARED),0) | ||
LIBTYPE_SUFFIX = lib | ||
endif | ||
ifeq ($(SHARED),1) | ||
LIBTYPE_SUFFIX = dll | ||
endif | ||
ifeq ($(MONOLITHIC),0) | ||
EXTRALIBS_FOR_BASE = | ||
endif | ||
ifeq ($(MONOLITHIC),1) | ||
EXTRALIBS_FOR_BASE = | ||
endif | ||
ifeq ($(BUILD),debug) | ||
__OPTIMIZEFLAG_2 = -O0 | ||
endif | ||
ifeq ($(BUILD),release) | ||
__OPTIMIZEFLAG_2 = -O2 | ||
endif | ||
ifeq ($(USE_RTTI),0) | ||
__RTTIFLAG_5 = -fno-rtti | ||
endif | ||
ifeq ($(USE_RTTI),1) | ||
__RTTIFLAG_5 = | ||
endif | ||
ifeq ($(USE_EXCEPTIONS),0) | ||
__EXCEPTIONSFLAG_6 = -fno-exceptions | ||
endif | ||
ifeq ($(USE_EXCEPTIONS),1) | ||
__EXCEPTIONSFLAG_6 = | ||
endif | ||
ifeq ($(WXUNIV),1) | ||
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ | ||
endif | ||
ifeq ($(DEBUG_FLAG),0) | ||
__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 | ||
endif | ||
ifeq ($(BUILD),release) | ||
__NDEBUG_DEFINE_p = -DNDEBUG | ||
endif | ||
ifeq ($(USE_EXCEPTIONS),0) | ||
__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | ||
endif | ||
ifeq ($(USE_RTTI),0) | ||
__RTTI_DEFINE_p = -DwxNO_RTTI | ||
endif | ||
ifeq ($(USE_THREADS),0) | ||
__THREAD_DEFINE_p = -DwxNO_THREADS | ||
endif | ||
ifeq ($(UNICODE),0) | ||
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 | ||
endif | ||
ifeq ($(UNICODE),1) | ||
__UNICODE_DEFINE_p = -D_UNICODE | ||
endif | ||
ifeq ($(USE_CAIRO),1) | ||
____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo | ||
endif | ||
ifeq ($(SHARED),1) | ||
__DLLFLAG_p = -DWXUSINGDLL | ||
endif | ||
ifeq ($(MONOLITHIC),0) | ||
__WXLIB_NET_p = \ | ||
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net | ||
endif | ||
ifeq ($(MONOLITHIC),0) | ||
__WXLIB_BASE_p = \ | ||
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) | ||
endif | ||
ifeq ($(MONOLITHIC),1) | ||
__WXLIB_MONO_p = \ | ||
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) | ||
endif | ||
ifeq ($(MONOLITHIC),1) | ||
__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) | ||
endif | ||
ifeq ($(USE_GUI),1) | ||
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) | ||
endif | ||
ifeq ($(USE_CAIRO),1) | ||
__CAIRO_LIB_p = -lcairo | ||
endif | ||
ifeq ($(USE_CAIRO),1) | ||
____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib | ||
endif | ||
ifeq ($(BUILD),debug) | ||
ifeq ($(DEBUG_INFO),default) | ||
__DEBUGINFO = -g | ||
endif | ||
endif | ||
ifeq ($(BUILD),release) | ||
ifeq ($(DEBUG_INFO),default) | ||
__DEBUGINFO = | ||
endif | ||
endif | ||
ifeq ($(DEBUG_INFO),0) | ||
__DEBUGINFO = | ||
endif | ||
ifeq ($(DEBUG_INFO),1) | ||
__DEBUGINFO = -g | ||
endif | ||
ifeq ($(USE_THREADS),0) | ||
__THREADSFLAG = | ||
endif | ||
ifeq ($(USE_THREADS),1) | ||
__THREADSFLAG = -mthreads | ||
endif | ||
|
||
|
||
all: $(OBJS) | ||
$(OBJS): | ||
-if not exist $(OBJS) mkdir $(OBJS) | ||
|
||
### Targets: ### | ||
|
||
all: $(OBJS)\console.exe | ||
|
||
clean: | ||
-if exist $(OBJS)\*.o del $(OBJS)\*.o | ||
-if exist $(OBJS)\*.d del $(OBJS)\*.d | ||
-if exist $(OBJS)\console.exe del $(OBJS)\console.exe | ||
|
||
$(OBJS)\console.exe: $(CONSOLE_OBJECTS) | ||
$(CXX) -o $@ $(CONSOLE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet | ||
|
||
$(OBJS)\console_console.o: ./console.cpp | ||
$(CXX) -c -o $@ $(CONSOLE_CXXFLAGS) $(CPPDEPS) $< | ||
|
||
.PHONY: all clean | ||
|
||
|
||
SHELL := $(COMSPEC) | ||
|
||
# Dependencies tracking: | ||
-include $(OBJS)/*.d |