more samples makefiles fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
@@ -55,39 +55,39 @@ WXUNIVNAME =
|
||||
!ifeq WXUNIV 1
|
||||
WXUNIVNAME = univ
|
||||
!endif
|
||||
__DEBUGINFO_0 =
|
||||
__DEBUGINFO =
|
||||
!ifeq BUILD debug
|
||||
!ifeq DEBUG_INFO default
|
||||
__DEBUGINFO_0 = -d2
|
||||
__DEBUGINFO = debug all
|
||||
!endif
|
||||
!endif
|
||||
!ifeq BUILD release
|
||||
!ifeq DEBUG_INFO default
|
||||
__DEBUGINFO_0 = -d0
|
||||
__DEBUGINFO =
|
||||
!endif
|
||||
!endif
|
||||
!ifeq DEBUG_INFO 0
|
||||
__DEBUGINFO_0 = -d0
|
||||
__DEBUGINFO =
|
||||
!endif
|
||||
!ifeq DEBUG_INFO 1
|
||||
__DEBUGINFO_0 = -d2
|
||||
__DEBUGINFO = debug all
|
||||
!endif
|
||||
__DEBUGINFO_1 =
|
||||
__DEBUGINFO_2 =
|
||||
!ifeq BUILD debug
|
||||
!ifeq DEBUG_INFO default
|
||||
__DEBUGINFO_1 = debug all
|
||||
__DEBUGINFO_2 = -d2
|
||||
!endif
|
||||
!endif
|
||||
!ifeq BUILD release
|
||||
!ifeq DEBUG_INFO default
|
||||
__DEBUGINFO_1 =
|
||||
__DEBUGINFO_2 = -d0
|
||||
!endif
|
||||
!endif
|
||||
!ifeq DEBUG_INFO 0
|
||||
__DEBUGINFO_1 =
|
||||
__DEBUGINFO_2 = -d0
|
||||
!endif
|
||||
!ifeq DEBUG_INFO 1
|
||||
__DEBUGINFO_1 = debug all
|
||||
__DEBUGINFO_2 = -d2
|
||||
!endif
|
||||
__DEBUG_DEFINE_p =
|
||||
!ifeq BUILD debug
|
||||
@@ -114,19 +114,19 @@ __LIB_TIFF_p =
|
||||
!ifeq USE_GUI 1
|
||||
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
|
||||
!endif
|
||||
__OPTIMIZEFLAG_2 =
|
||||
__OPTIMIZEFLAG =
|
||||
!ifeq BUILD debug
|
||||
__OPTIMIZEFLAG_2 = -od
|
||||
__OPTIMIZEFLAG = -od
|
||||
!endif
|
||||
!ifeq BUILD release
|
||||
__OPTIMIZEFLAG_2 = -ot -ox
|
||||
__OPTIMIZEFLAG = -ot -ox
|
||||
!endif
|
||||
__RUNTIME_LIBS_5 =
|
||||
__RUNTIME_LIBS =
|
||||
!ifeq RUNTIME_LIBS dynamic
|
||||
__RUNTIME_LIBS_5 = -br
|
||||
__RUNTIME_LIBS = -br
|
||||
!endif
|
||||
!ifeq RUNTIME_LIBS static
|
||||
__RUNTIME_LIBS_5 =
|
||||
__RUNTIME_LIBS =
|
||||
!endif
|
||||
__UNICODE_DEFINE_p =
|
||||
!ifeq UNICODE 1
|
||||
@@ -146,6 +146,10 @@ __WXLIB_MONO_p =
|
||||
__WXLIB_MONO_p = &
|
||||
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
|
||||
!endif
|
||||
__WXLIB_NET_p =
|
||||
!ifeq MONOLITHIC 0
|
||||
__WXLIB_NET_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
|
||||
!endif
|
||||
__WXUNIV_DEFINE_p =
|
||||
!ifeq WXUNIV 1
|
||||
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
|
||||
@@ -153,18 +157,26 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
|
||||
|
||||
### Variables: ###
|
||||
|
||||
IPC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
|
||||
$(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
CLIENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_2) $(__OPTIMIZEFLAG) -bm &
|
||||
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) &
|
||||
-i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png &
|
||||
-i=.\..\..\src\zlib -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. &
|
||||
$(__DLLFLAG_p) $(CXXFLAGS)
|
||||
IPC_OBJECTS = &
|
||||
$(OBJS)\ipc_ipc.obj
|
||||
CLIENT_OBJECTS = &
|
||||
$(OBJS)\client_client.obj
|
||||
LIBDIRNAME = &
|
||||
.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = &
|
||||
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
SERVER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_2) $(__OPTIMIZEFLAG) -bm &
|
||||
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) &
|
||||
-i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png &
|
||||
-i=.\..\..\src\zlib -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. &
|
||||
$(__DLLFLAG_p) $(CXXFLAGS)
|
||||
SERVER_OBJECTS = &
|
||||
$(OBJS)\server_server.obj
|
||||
|
||||
MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
|
||||
|
||||
@@ -175,28 +187,46 @@ $(OBJS) :
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all : .SYMBOLIC $(OBJS)\ipc.exe
|
||||
all : .SYMBOLIC $(OBJS)\client.exe $(OBJS)\server.exe
|
||||
|
||||
$(OBJS)\ipc_ipc.obj : .AUTODEPEND .\ipc.cpp
|
||||
$(CXX) -zq -fo=$^@ $(IPC_CXXFLAGS) $<
|
||||
$(OBJS)\client_client.obj : .AUTODEPEND .\client.cpp
|
||||
$(CXX) -zq -fo=$^@ $(CLIENT_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\ipc_ipc.res : .AUTODEPEND .\ipc.rc
|
||||
$(OBJS)\client_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
|
||||
|
||||
$(OBJS)\server_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
|
||||
|
||||
$(OBJS)\server_server.obj : .AUTODEPEND .\server.cpp
|
||||
$(CXX) -zq -fo=$^@ $(SERVER_CXXFLAGS) $<
|
||||
|
||||
clean : .SYMBOLIC
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
-if exist $(OBJS)\*.res del $(OBJS)\*.res
|
||||
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
|
||||
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
|
||||
-if exist $(OBJS)\ipc.exe del $(OBJS)\ipc.exe
|
||||
-if exist $(OBJS)\client.exe del $(OBJS)\client.exe
|
||||
-if exist $(OBJS)\server.exe del $(OBJS)\server.exe
|
||||
|
||||
$(OBJS)\ipc.exe : $(IPC_OBJECTS) $(OBJS)\ipc_ipc.res
|
||||
@%create $(OBJS)\ipc.lbc
|
||||
@%append $(OBJS)\ipc.lbc option quiet
|
||||
@%append $(OBJS)\ipc.lbc name $^@
|
||||
@%append $(OBJS)\ipc.lbc option incremental
|
||||
@%append $(OBJS)\ipc.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@for %i in ($(IPC_OBJECTS)) do @%append $(OBJS)\ipc.lbc file %i
|
||||
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) 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 ) do @%append $(OBJS)\ipc.lbc library %i
|
||||
@%append $(OBJS)\ipc.lbc option resource=$(OBJS)\ipc_ipc.res
|
||||
wlink @$(OBJS)\ipc.lbc
|
||||
$(OBJS)\client.exe : $(CLIENT_OBJECTS) $(OBJS)\client_sample.res
|
||||
@%create $(OBJS)\client.lbc
|
||||
@%append $(OBJS)\client.lbc option quiet
|
||||
@%append $(OBJS)\client.lbc name $^@
|
||||
@%append $(OBJS)\client.lbc option incremental
|
||||
@%append $(OBJS)\client.lbc $(LDFLAGS) $(__DEBUGINFO) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@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$(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 ) do @%append $(OBJS)\client.lbc library %i
|
||||
@%append $(OBJS)\client.lbc option resource=$(OBJS)\client_sample.res
|
||||
wlink @$(OBJS)\client.lbc
|
||||
|
||||
$(OBJS)\server.exe : $(SERVER_OBJECTS) $(OBJS)\server_sample.res
|
||||
@%create $(OBJS)\server.lbc
|
||||
@%append $(OBJS)\server.lbc option quiet
|
||||
@%append $(OBJS)\server.lbc name $^@
|
||||
@%append $(OBJS)\server.lbc option incremental
|
||||
@%append $(OBJS)\server.lbc $(LDFLAGS) $(__DEBUGINFO) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@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$(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 ) do @%append $(OBJS)\server.lbc library %i
|
||||
@%append $(OBJS)\server.lbc option resource=$(OBJS)\server_sample.res
|
||||
wlink @$(OBJS)\server.lbc
|
||||
|
||||
Reference in New Issue
Block a user