regenerated all makefiles with bakefile 0.2.0; removed REZ option from config.bkl as it's now defined by bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -215,7 +215,7 @@ SETUPHDIR = &
|
||||
CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
|
||||
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 &
|
||||
$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -wx -wcd=549 &
|
||||
-wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
|
||||
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
|
||||
CLIENT_OBJECTS = &
|
||||
@@ -223,7 +223,7 @@ CLIENT_OBJECTS = &
|
||||
SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
|
||||
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 &
|
||||
$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -wx -wcd=549 &
|
||||
-wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
|
||||
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
|
||||
SERVER_OBJECTS = &
|
||||
@@ -256,6 +256,7 @@ $(OBJS)\client.exe : $(CLIENT_OBJECTS) $(OBJS)\client_client.res
|
||||
@for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i
|
||||
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) 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 odbc32.lib ) do @%append $(OBJS)\client.lbc library %i
|
||||
@%append $(OBJS)\client.lbc option resource=$(OBJS)\client_client.res
|
||||
@for %i in () do @%append $(OBJS)\client.lbc option stack=%i
|
||||
wlink @$(OBJS)\client.lbc
|
||||
|
||||
$(OBJS)\server.exe : $(SERVER_OBJECTS) $(OBJS)\server_server.res
|
||||
@@ -267,17 +268,18 @@ $(OBJS)\server.exe : $(SERVER_OBJECTS) $(OBJS)\server_server.res
|
||||
@for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i
|
||||
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) 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 odbc32.lib ) do @%append $(OBJS)\server.lbc library %i
|
||||
@%append $(OBJS)\server.lbc option resource=$(OBJS)\server_server.res
|
||||
@for %i in () do @%append $(OBJS)\server.lbc option stack=%i
|
||||
wlink @$(OBJS)\server.lbc
|
||||
|
||||
$(OBJS)\client_client.obj : .AUTODEPEND .\client.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CLIENT_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\client_client.res : .AUTODEPEND .\client.rc
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
|
||||
|
||||
$(OBJS)\server_server.obj : .AUTODEPEND .\server.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(SERVER_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\server_server.res : .AUTODEPEND .\server.rc
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
|
||||
|
||||
|
Reference in New Issue
Block a user