wxUSE_GUI=0 not needed anymore

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-10-21 14:05:45 +00:00
parent 1315b91d84
commit c2149c93d5
7 changed files with 85 additions and 104 deletions

View File

@@ -4,7 +4,12 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
.autodepend
!ifndef BCCDIR
!ifndef MAKEDIR
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
!endif
BCCDIR = $(MAKEDIR)\..
!endif
@@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\..
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
!if "$(BCCDIR)" == "\.."
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
!endif
### Variables: ###
CONSOLE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
CONSOLE_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
-I. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS)
-I. $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS)
CONSOLE_OBJECTS = \
$(OBJS)\console_console.obj
OBJS = \
@@ -90,9 +91,6 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(MONOLITHIC)" == "0"
__MULTILIB_FLAG_p = -DwxUSE_GUI=0
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od
!endif
@@ -151,7 +149,7 @@ clean:
-if exist $(OBJS)\console.ils del $(OBJS)\console.ils
$(OBJS)\console.exe: $(CONSOLE_OBJECTS)
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&|
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&|
c0x32.obj $(CONSOLE_OBJECTS),$@,, $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
|