regenerated after adding DEBUG_ options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -55,7 +55,8 @@ SERVER_OBJECTS = \
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@COND_BUILD_DEBUG@WXDEBUGFLAG = d
|
||||
@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
|
||||
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
|
||||
@COND_UNICODE_1@WXUNICODEFLAG = u
|
||||
@COND_WXUNIV_1@WXUNIVNAME = univ
|
||||
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
|
||||
|
@@ -20,7 +20,7 @@ BCCDIR = $(MAKEDIR)\..
|
||||
|
||||
### Variables: ###
|
||||
|
||||
CLIENT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
|
||||
CLIENT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -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 \
|
||||
@@ -31,7 +31,7 @@ LIBDIRNAME = \
|
||||
.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = \
|
||||
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
SERVER_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
|
||||
SERVER_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -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 \
|
||||
@@ -47,7 +47,10 @@ PORTNAME = base
|
||||
!if "$(USE_GUI)" == "1"
|
||||
PORTNAME = msw
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
|
||||
WXDEBUGFLAG = d
|
||||
!endif
|
||||
!if "$(DEBUG_FLAG)" == "1"
|
||||
WXDEBUGFLAG = d
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
@@ -59,16 +62,28 @@ WXUNICODEFLAG = u
|
||||
!if "$(WXUNIV)" == "1"
|
||||
WXUNIVNAME = univ
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
__DEBUGFLAG = -v
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
|
||||
__DEBUGINFO = -v
|
||||
!endif
|
||||
!if "$(BUILD)" == "release"
|
||||
__DEBUGFLAG = -v-
|
||||
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
|
||||
__DEBUGINFO = -v-
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
!if "$(DEBUG_INFO)" == "0"
|
||||
__DEBUGINFO = -v-
|
||||
!endif
|
||||
!if "$(DEBUG_INFO)" == "1"
|
||||
__DEBUGINFO = -v
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
|
||||
__DEBUG_DEFINE_p = -D__WXDEBUG__
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
!if "$(DEBUG_FLAG)" == "1"
|
||||
__DEBUG_DEFINE_p = -D__WXDEBUG__
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
|
||||
__DEBUG_DEFINE_p_0 = -d__WXDEBUG__
|
||||
!endif
|
||||
!if "$(DEBUG_FLAG)" == "1"
|
||||
__DEBUG_DEFINE_p_0 = -d__WXDEBUG__
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
@@ -159,11 +174,11 @@ clean:
|
||||
-if exist $(OBJS)\server.exe del $(OBJS)\server.exe
|
||||
|
||||
$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res
|
||||
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L$(LIBDIRNAME) -aa @&&|
|
||||
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
|
||||
c0w32.obj $(CLIENT_OBJECTS),$@,, $(__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 import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_0).lib,, $(OBJS)\client_client.res
|
||||
|
|
||||
|
||||
$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res
|
||||
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L$(LIBDIRNAME) -aa @&&|
|
||||
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
|
||||
c0w32.obj $(SERVER_OBJECTS),$@,, $(__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 import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_0).lib,, $(OBJS)\server_server.res
|
||||
|
|
||||
|
@@ -12,29 +12,23 @@ include ../../build/config.gcc
|
||||
|
||||
### Variables: ###
|
||||
|
||||
CLIENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -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)
|
||||
CLIENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
CLIENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -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)
|
||||
CLIENT_OBJECTS = $(OBJS)\client_client.o $(OBJS)\client_client_rc.o
|
||||
CLIENT_OBJECTS = \
|
||||
$(OBJS)\client_client.o \
|
||||
$(OBJS)\client_client_rc.o
|
||||
LIBDIRNAME = .\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
LIBDIRNAME = \
|
||||
.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = \
|
||||
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
SERVER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -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_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
SERVER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -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.o $(OBJS)\server_server_rc.o
|
||||
SERVER_OBJECTS = \
|
||||
$(OBJS)\server_server.o \
|
||||
$(OBJS)\server_server_rc.o
|
||||
@@ -51,6 +45,11 @@ ifeq ($(USE_GUI),1)
|
||||
PORTNAME = msw
|
||||
endif
|
||||
ifeq ($(BUILD),debug)
|
||||
ifeq ($(DEBUG_FLAG),default)
|
||||
WXDEBUGFLAG = d
|
||||
endif
|
||||
endif
|
||||
ifeq ($(DEBUG_FLAG),1)
|
||||
WXDEBUGFLAG = d
|
||||
endif
|
||||
ifeq ($(SHARED),1)
|
||||
@@ -63,15 +62,35 @@ ifeq ($(WXUNIV),1)
|
||||
WXUNIVNAME = univ
|
||||
endif
|
||||
ifeq ($(BUILD),debug)
|
||||
__DEBUGFLAG = -g
|
||||
ifeq ($(DEBUG_INFO),default)
|
||||
__DEBUGINFO = -g
|
||||
endif
|
||||
endif
|
||||
ifeq ($(BUILD),release)
|
||||
__DEBUGFLAG =
|
||||
ifeq ($(DEBUG_INFO),default)
|
||||
__DEBUGINFO =
|
||||
endif
|
||||
endif
|
||||
ifeq ($(DEBUG_INFO),0)
|
||||
__DEBUGINFO =
|
||||
endif
|
||||
ifeq ($(DEBUG_INFO),1)
|
||||
__DEBUGINFO = -g
|
||||
endif
|
||||
ifeq ($(BUILD),debug)
|
||||
ifeq ($(DEBUG_FLAG),default)
|
||||
__DEBUG_DEFINE_p = -D__WXDEBUG__
|
||||
endif
|
||||
endif
|
||||
ifeq ($(DEBUG_FLAG),1)
|
||||
__DEBUG_DEFINE_p = -D__WXDEBUG__
|
||||
endif
|
||||
ifeq ($(BUILD),debug)
|
||||
ifeq ($(DEBUG_FLAG),default)
|
||||
__DEBUG_DEFINE_p_0 = --define __WXDEBUG__
|
||||
endif
|
||||
endif
|
||||
ifeq ($(DEBUG_FLAG),1)
|
||||
__DEBUG_DEFINE_p_0 = --define __WXDEBUG__
|
||||
endif
|
||||
ifeq ($(SHARED),1)
|
||||
@@ -149,9 +168,9 @@ clean:
|
||||
-if exist $(OBJS)\server.exe del $(OBJS)\server.exe
|
||||
|
||||
$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client_rc.o
|
||||
$(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
|
||||
$(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
|
||||
|
||||
$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server_rc.o
|
||||
$(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
|
||||
$(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
|
||||
|
||||
.PHONY: all clean
|
||||
|
@@ -12,11 +12,11 @@
|
||||
|
||||
### Variables: ###
|
||||
|
||||
CLIENT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_2) /DWIN32 \
|
||||
$(__DEBUGFLAG) $(____DEBUGFLAG_0) /Fd$(OBJS)\client.pdb $(__OPTIMIZEFLAG) \
|
||||
/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 \
|
||||
CLIENT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
|
||||
$(__DEBUGINFO) /Fd$(OBJS)\client.pdb $(____DEBUGRUNTIME_2_p) \
|
||||
$(__OPTIMIZEFLAG) /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) /D_WINDOWS $(CXXFLAGS)
|
||||
CLIENT_OBJECTS = \
|
||||
$(OBJS)\client_client.obj \
|
||||
@@ -25,11 +25,11 @@ LIBDIRNAME = \
|
||||
.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = \
|
||||
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
SERVER_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_2) /DWIN32 \
|
||||
$(__DEBUGFLAG) $(____DEBUGFLAG_0) /Fd$(OBJS)\server.pdb $(__OPTIMIZEFLAG) \
|
||||
/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 \
|
||||
SERVER_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_13) /DWIN32 \
|
||||
$(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(____DEBUGRUNTIME_12_p) \
|
||||
$(__OPTIMIZEFLAG) /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) /D_WINDOWS $(CXXFLAGS)
|
||||
SERVER_OBJECTS = \
|
||||
$(OBJS)\server_server.obj \
|
||||
@@ -43,7 +43,10 @@ PORTNAME = base
|
||||
!if "$(USE_GUI)" == "1"
|
||||
PORTNAME = msw
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
|
||||
WXDEBUGFLAG = d
|
||||
!endif
|
||||
!if "$(DEBUG_FLAG)" == "1"
|
||||
WXDEBUGFLAG = d
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
@@ -55,28 +58,70 @@ WXUNICODEFLAG = u
|
||||
!if "$(WXUNIV)" == "1"
|
||||
WXUNIVNAME = univ
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
__DEBUGFLAG = /Zi
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
|
||||
__DEBUGINFO = /Zi
|
||||
!endif
|
||||
!if "$(BUILD)" == "release"
|
||||
__DEBUGFLAG =
|
||||
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
|
||||
__DEBUGINFO =
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
__DEBUGFLAG_1 = /DEBUG
|
||||
!if "$(DEBUG_INFO)" == "0"
|
||||
__DEBUGINFO =
|
||||
!endif
|
||||
!if "$(BUILD)" == "release"
|
||||
__DEBUGFLAG_1 =
|
||||
!if "$(DEBUG_INFO)" == "1"
|
||||
__DEBUGINFO = /Zi
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
__DEBUGFLAG_2 = d
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
|
||||
__DEBUGINFO_1 = /DEBUG
|
||||
!endif
|
||||
!if "$(BUILD)" == "release"
|
||||
__DEBUGFLAG_2 =
|
||||
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
|
||||
__DEBUGINFO_1 =
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
!if "$(DEBUG_INFO)" == "0"
|
||||
__DEBUGINFO_1 =
|
||||
!endif
|
||||
!if "$(DEBUG_INFO)" == "1"
|
||||
__DEBUGINFO_1 = /DEBUG
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
|
||||
__DEBUGINFO_2 = d
|
||||
!endif
|
||||
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
|
||||
__DEBUGINFO_2 =
|
||||
!endif
|
||||
!if "$(DEBUG_INFO)" == "0"
|
||||
__DEBUGINFO_2 =
|
||||
!endif
|
||||
!if "$(DEBUG_INFO)" == "1"
|
||||
__DEBUGINFO_2 = d
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
|
||||
__DEBUGRUNTIME_13 =
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
|
||||
__DEBUGRUNTIME_13 = d
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
|
||||
__DEBUGRUNTIME_13 = $(__DEBUGINFO_2)
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
|
||||
__DEBUGRUNTIME_3 =
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
|
||||
__DEBUGRUNTIME_3 = d
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
|
||||
__DEBUGRUNTIME_3 = $(__DEBUGINFO_2)
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
|
||||
__DEBUG_DEFINE_p = /D__WXDEBUG__
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
!if "$(DEBUG_FLAG)" == "1"
|
||||
__DEBUG_DEFINE_p = /D__WXDEBUG__
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
|
||||
__DEBUG_DEFINE_p_0 = /d __WXDEBUG__
|
||||
!endif
|
||||
!if "$(DEBUG_FLAG)" == "1"
|
||||
__DEBUG_DEFINE_p_0 = /d __WXDEBUG__
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
@@ -132,17 +177,65 @@ __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
|
||||
!if "$(WXUNIV)" == "1"
|
||||
__WXUNIV_DEFINE_p_0 = /d __WXUNIVERSAL__
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
____DEBUGFLAG = /d _DEBUG
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
|
||||
____DEBUGINFO = /d _DEBUG
|
||||
!endif
|
||||
!if "$(BUILD)" == "release"
|
||||
____DEBUGFLAG = /d NDEBUG
|
||||
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
|
||||
____DEBUGINFO = /d NDEBUG
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
____DEBUGFLAG_0 = /D_DEBUG
|
||||
!if "$(DEBUG_INFO)" == "0"
|
||||
____DEBUGINFO = /d NDEBUG
|
||||
!endif
|
||||
!if "$(BUILD)" == "release"
|
||||
____DEBUGFLAG_0 = /DNDEBUG
|
||||
!if "$(DEBUG_INFO)" == "1"
|
||||
____DEBUGINFO = /d _DEBUG
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
|
||||
____DEBUGINFO_0 = /D_DEBUG
|
||||
!endif
|
||||
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
|
||||
____DEBUGINFO_0 = /DNDEBUG
|
||||
!endif
|
||||
!if "$(DEBUG_INFO)" == "0"
|
||||
____DEBUGINFO_0 = /DNDEBUG
|
||||
!endif
|
||||
!if "$(DEBUG_INFO)" == "1"
|
||||
____DEBUGINFO_0 = /D_DEBUG
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
|
||||
____DEBUGRUNTIME_12_p = /DNDEBUG
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
|
||||
____DEBUGRUNTIME_12_p = /D_DEBUG
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
|
||||
____DEBUGRUNTIME_12_p = $(____DEBUGINFO_0)
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
|
||||
____DEBUGRUNTIME_12_p_1 = /d NDEBUG
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
|
||||
____DEBUGRUNTIME_12_p_1 = /d _DEBUG
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
|
||||
____DEBUGRUNTIME_12_p_1 = $(____DEBUGINFO)
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
|
||||
____DEBUGRUNTIME_2_p = /DNDEBUG
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
|
||||
____DEBUGRUNTIME_2_p = /D_DEBUG
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
|
||||
____DEBUGRUNTIME_2_p = $(____DEBUGINFO_0)
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
|
||||
____DEBUGRUNTIME_2_p_1 = /d NDEBUG
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
|
||||
____DEBUGRUNTIME_2_p_1 = /d _DEBUG
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
|
||||
____DEBUGRUNTIME_2_p_1 = $(____DEBUGINFO)
|
||||
!endif
|
||||
|
||||
|
||||
@@ -158,13 +251,13 @@ $(OBJS)\client_client.obj: .\client.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CLIENT_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\client_client.res: .\client.rc
|
||||
rc /fo$@ /d WIN32 $(____DEBUGFLAG) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) /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_0) /d _WINDOWS $**
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) /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_0) /d _WINDOWS $**
|
||||
|
||||
$(OBJS)\server_server.obj: .\server.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(SERVER_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\server_server.res: .\server.rc
|
||||
rc /fo$@ /d WIN32 $(____DEBUGFLAG) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) /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_0) /d _WINDOWS $**
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_12_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) /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_0) /d _WINDOWS $**
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
@@ -173,11 +266,11 @@ clean:
|
||||
-if exist $(OBJS)\server.exe del $(OBJS)\server.exe
|
||||
|
||||
$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res
|
||||
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
|
||||
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
|
||||
$(CLIENT_OBJECTS) $(__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
|
||||
<<
|
||||
|
||||
$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res
|
||||
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
|
||||
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
|
||||
$(SERVER_OBJECTS) $(__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
|
||||
<<
|
||||
|
@@ -36,6 +36,11 @@ PORTNAME = msw
|
||||
!endif
|
||||
WXDEBUGFLAG =
|
||||
!ifeq BUILD debug
|
||||
!ifeq DEBUG_FLAG default
|
||||
WXDEBUGFLAG = d
|
||||
!endif
|
||||
!endif
|
||||
!ifeq DEBUG_FLAG 1
|
||||
WXDEBUGFLAG = d
|
||||
!endif
|
||||
WXDLLFLAG =
|
||||
@@ -50,22 +55,47 @@ WXUNIVNAME =
|
||||
!ifeq WXUNIV 1
|
||||
WXUNIVNAME = univ
|
||||
!endif
|
||||
__DEBUGFLAG =
|
||||
__DEBUGINFO =
|
||||
!ifeq BUILD debug
|
||||
__DEBUGFLAG = debug all
|
||||
!ifeq DEBUG_INFO default
|
||||
__DEBUGINFO = debug all
|
||||
!endif
|
||||
!endif
|
||||
!ifeq BUILD release
|
||||
__DEBUGFLAG =
|
||||
!ifeq DEBUG_INFO default
|
||||
__DEBUGINFO =
|
||||
!endif
|
||||
__DEBUGFLAG_2 =
|
||||
!endif
|
||||
!ifeq DEBUG_INFO 0
|
||||
__DEBUGINFO =
|
||||
!endif
|
||||
!ifeq DEBUG_INFO 1
|
||||
__DEBUGINFO = debug all
|
||||
!endif
|
||||
__DEBUGINFO_2 =
|
||||
!ifeq BUILD debug
|
||||
__DEBUGFLAG_2 = -d2
|
||||
!ifeq DEBUG_INFO default
|
||||
__DEBUGINFO_2 = -d2
|
||||
!endif
|
||||
!endif
|
||||
!ifeq BUILD release
|
||||
__DEBUGFLAG_2 = -d0
|
||||
!ifeq DEBUG_INFO default
|
||||
__DEBUGINFO_2 = -d0
|
||||
!endif
|
||||
!endif
|
||||
!ifeq DEBUG_INFO 0
|
||||
__DEBUGINFO_2 = -d0
|
||||
!endif
|
||||
!ifeq DEBUG_INFO 1
|
||||
__DEBUGINFO_2 = -d2
|
||||
!endif
|
||||
__DEBUG_DEFINE_p =
|
||||
!ifeq BUILD debug
|
||||
!ifeq DEBUG_FLAG default
|
||||
__DEBUG_DEFINE_p = -d__WXDEBUG__
|
||||
!endif
|
||||
!endif
|
||||
!ifeq DEBUG_FLAG 1
|
||||
__DEBUG_DEFINE_p = -d__WXDEBUG__
|
||||
!endif
|
||||
__DLLFLAG_p =
|
||||
@@ -127,7 +157,7 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
|
||||
|
||||
### Variables: ###
|
||||
|
||||
CLIENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_2) $(__OPTIMIZEFLAG) -bm &
|
||||
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 &
|
||||
@@ -139,7 +169,7 @@ LIBDIRNAME = &
|
||||
.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = &
|
||||
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
SERVER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_2) $(__OPTIMIZEFLAG) -bm &
|
||||
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 &
|
||||
@@ -183,7 +213,7 @@ $(OBJS)\client.exe : $(CLIENT_OBJECTS) $(OBJS)\client_client.res
|
||||
@%append $(OBJS)\client.lbc option quiet
|
||||
@%append $(OBJS)\client.lbc name $^@
|
||||
@%append $(OBJS)\client.lbc option incremental
|
||||
@%append $(OBJS)\client.lbc $(LDFLAGS) $(__DEBUGFLAG) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@%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_client.res
|
||||
@@ -194,7 +224,7 @@ $(OBJS)\server.exe : $(SERVER_OBJECTS) $(OBJS)\server_server.res
|
||||
@%append $(OBJS)\server.lbc option quiet
|
||||
@%append $(OBJS)\server.lbc name $^@
|
||||
@%append $(OBJS)\server.lbc option incremental
|
||||
@%append $(OBJS)\server.lbc $(LDFLAGS) $(__DEBUGFLAG) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@%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_server.res
|
||||
|
Reference in New Issue
Block a user