From: Kern Sibbald Date: Sun, 18 Jul 2004 09:23:42 +0000 (+0000) Subject: Some Win32 fixes X-Git-Tag: Release-1.35.1~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53bd7811267fc13fa159e7a3272083d96f626c8d;p=thirdparty%2Fbacula.git Some Win32 fixes git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1480 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 35b024b28..fff33f7ac 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -1625,7 +1625,6 @@ AC_OUTPUT([autoconf/Make.common \ scripts/gconsole \ scripts/bacula \ scripts/devel_bacula \ - scripts/fd \ scripts/Makefile \ scripts/logrotate \ scripts/bacula.desktop.gnome1 \ diff --git a/bacula/configure b/bacula/configure index 4bf687d9d..a355cebc1 100755 --- a/bacula/configure +++ b/bacula/configure @@ -18368,7 +18368,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi - ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/fd scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf $PFILES" + ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf $PFILES" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18912,7 +18912,6 @@ do "scripts/gconsole" ) CONFIG_FILES="$CONFIG_FILES scripts/gconsole" ;; "scripts/bacula" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula" ;; "scripts/devel_bacula" ) CONFIG_FILES="$CONFIG_FILES scripts/devel_bacula" ;; - "scripts/fd" ) CONFIG_FILES="$CONFIG_FILES scripts/fd" ;; "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; "scripts/logrotate" ) CONFIG_FILES="$CONFIG_FILES scripts/logrotate" ;; "scripts/bacula.desktop.gnome1" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome1" ;; diff --git a/bacula/kernstodo b/bacula/kernstodo index 254d5dcc3..2f7c3ee53 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -2,7 +2,7 @@ 14 July 2004 1.35 Items to do: -- Make sure that all errors from libacl are printed. +- Fix GROUP BYs in all SQL. - Add new DCR calling sequences everywhere in SD. This will permit simultaneous use of multiple devices by a single job. @@ -1100,3 +1100,4 @@ Block Position: 0 - Add priority to Scheduled jobs status listing. - Look at Win32 inc problem when new directory added files not saved??? - Require resource names to be unique. +- Make sure that all errors from libacl are printed. diff --git a/bacula/scripts/mtx-changer.in b/bacula/scripts/mtx-changer.in index e1c0d4a98..e4fdee8ba 100644 --- a/bacula/scripts/mtx-changer.in +++ b/bacula/scripts/mtx-changer.in @@ -38,6 +38,9 @@ MTX=@MTX@ # not running on Linux, you will probably need to # re-write it. # +# If you have a FreeBSD system, you might want to change +# the $(seq 180) to $(jot 180) -- tip from Brian McDonald +# wait_for_drive() { for i in $(seq 180); do # Wait max 180 seconds if mt -f $1 status >/dev/null 2>&1; then diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c index 0a2127135..bbbefa899 100644 --- a/bacula/src/dird/job.c +++ b/bacula/src/dird/job.c @@ -74,10 +74,14 @@ void init_job_server(int max_workers) * Run a job -- typically called by the scheduler, but may also * be called by the UA (Console program). * + * Returns: 0 on failure + * JobId on success + * */ -void run_job(JCR *jcr) +JobId_t run_job(JCR *jcr) { int stat, errstat; + JobId_t JobId = 0; P(jcr->mutex); sm_check(__FILE__, __LINE__, true); @@ -117,7 +121,7 @@ void run_job(JCR *jcr) Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db)); goto bail_out; } - jcr->JobId = jcr->jr.JobId; + JobId = jcr->JobId = jcr->jr.JobId; Dmsg4(100, "Created job record JobId=%d Name=%s Type=%c Level=%c\n", jcr->JobId, jcr->Job, jcr->jr.JobType, jcr->jr.JobLevel); @@ -126,17 +130,18 @@ void run_job(JCR *jcr) /* Queue the job to be run */ if ((stat = jobq_add(&job_queue, jcr)) != 0) { Jmsg(jcr, M_FATAL, 0, _("Could not add job queue: ERR=%s\n"), strerror(stat)); + JobId = 0; goto bail_out; } Dmsg0(100, "Done run_job()\n"); V(jcr->mutex); - return; + return JobId; bail_out: set_jcr_job_status(jcr, JS_ErrorTerminated); V(jcr->mutex); - return; + return JobId; } diff --git a/bacula/src/dird/protos.h b/bacula/src/dird/protos.h index 5dca711af..ac61ca993 100644 --- a/bacula/src/dird/protos.h +++ b/bacula/src/dird/protos.h @@ -87,7 +87,7 @@ extern void create_unique_job_name(JCR *jcr, const char *base_name); extern void update_job_end_record(JCR *jcr); extern bool get_or_create_client_record(JCR *jcr); extern bool get_or_create_fileset_record(JCR *jcr, FILESET_DBR *fsr); -extern void run_job(JCR *jcr); +extern JobId_t run_job(JCR *jcr); extern int cancel_job(UAContext *ua, JCR *jcr); extern void init_jcr_job_record(JCR *jcr); diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c index 8d5347dbc..9c9faec58 100644 --- a/bacula/src/dird/ua_restore.c +++ b/bacula/src/dird/ua_restore.c @@ -224,8 +224,6 @@ int restore_cmd(UAContext *ua, const char *cmd) Dmsg1(400, "Submitting: %s\n", ua->cmd); parse_ua_args(ua); run_cmd(ua, ua->cmd); - - bsendmsg(ua, _("Restore command done.\n")); free_rx(&rx); return 1; diff --git a/bacula/src/dird/ua_run.c b/bacula/src/dird/ua_run.c index 6fdd34784..4f02bf664 100644 --- a/bacula/src/dird/ua_run.c +++ b/bacula/src/dird/ua_run.c @@ -417,11 +417,7 @@ try_again: /* Run without prompting? */ if (find_arg(ua, _("yes")) > 0) { - Dmsg1(200, "Calling run_job job=%x\n", jcr->job); - run_job(jcr); - free_jcr(jcr); /* release jcr */ - bsendmsg(ua, _("Run command submitted.\n")); - return 1; + goto start_job; } /* @@ -797,10 +793,16 @@ Priority: %d\n"), } if (strncasecmp(ua->cmd, _("yes"), strlen(ua->cmd)) == 0) { + JobId_t JobId; Dmsg1(200, "Calling run_job job=%x\n", jcr->job); - run_job(jcr); +start_job: + JobId = run_job(jcr); free_jcr(jcr); /* release jcr */ - bsendmsg(ua, _("Run command submitted.\n")); + if (JobId == 0) { + bsendmsg(ua, _("Job failed.\n")); + } else { + bsendmsg(ua, _("Job started. JobId=%u\n"), JobId); + } return 1; } diff --git a/bacula/src/findlib/find.c b/bacula/src/findlib/find.c index f3d4ef931..0550e7378 100644 --- a/bacula/src/findlib/find.c +++ b/bacula/src/findlib/find.c @@ -169,6 +169,7 @@ static bool accept_file(FF_PKT *ff) return true; /* accept file */ } } +#ifndef WIN32 for (k=0; kregex.size(); k++) { const int nmatch = 30; regmatch_t pmatch[nmatch]; @@ -181,6 +182,7 @@ static bool accept_file(FF_PKT *ff) return true; /* accept file */ } } +#endif } for (i=0; iexclude_list.size(); i++) { diff --git a/bacula/src/version.h b/bacula/src/version.h index fa475a310..af92258e6 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -2,8 +2,8 @@ #undef VERSION #define VERSION "1.35.1" #define VSTRING "1" -#define BDATE "16 July 2004" -#define LSMDATE "16Jul04" +#define BDATE "17 July 2004" +#define LSMDATE "17Jul04" /* Debug flags */ #undef DEBUG diff --git a/bacula/src/win32/README.win32 b/bacula/src/win32/README.win32 index b5754bc46..520ab97c1 100644 --- a/bacula/src/win32/README.win32 +++ b/bacula/src/win32/README.win32 @@ -26,22 +26,18 @@ The directory structure is: zlib The zlib library (third party) wx The wxWidgets library (third party) -depkgs-win32 is released separate .tar.gz file that contains the +depkgs-win32 is released in a separate .tar.gz file that contains the source for the above mentioned libraries needed to build the Win32 Bacula. It can be found in the Source Forge Bacula project release section. To build it: -- Make sure nmake, and VC++ libraries and includes are setup correctly - in PATH, INCLUDE, and LIB environment variables. -- cd depkgs-win32 - make - You may have to build wx with VC++ (as was the case for me). - In that case, open wx/src/wxWindows.dsp with VC++, select - static complilation (not the DLL) of "Win32 Release", then - click build all. + After starting VC++, use File->Open Workspace then + open wx/src/wxWindows.dsw then use + Build->Build All or Build->build wxmsw.lib should work too. - cd bacula - ./configure + ./configure --enable-client-only cd src/win32 make @@ -99,3 +95,89 @@ Instructions if you want to build wx-console : NOTE! I (Kern) cannot build wxWindows with the Makefile -- I had to use VC Studio directly to do so following their instructions. + +Getting all the environment variables setup properly is not always so obvious. +Here is what I have when I do a "set" in a rxvt window, in which I build +Bacula. Probably what is important are INCLUDE, LIB, PATH, and WXWIN, but note +there are a zillion other things set: +!::='::\' +!C:='C:\cygwin\home\kern' +ALLUSERSPROFILE='C:\Documents and Settings\All Users' +APPDATA='C:\Documents and Settings\kern\Application Data' +BASEMAKE='C:\Program Files\Microsoft SDK\Include\BKOffice.Mak' +BASH=/usr/bin/bash +BASH_VERSINFO=([0]="2" [1]="05b" [2]="0" [3]="1" [4]="release" [5]="i686-pc-cygwin") +BASH_VERSION='2.05b.0(1)-release' +BKOFFICE='C:\Program Files\Microsoft SDK\.' +CLIENTNAME=Console +COLORFGBG='0;default;15' +COLORTERM=rxvt-xpm +COLUMNS=70 +COMMONPROGRAMFILES='C:\Program Files\Common Files' +COMPUTERNAME=TIBS +COMSPEC='C:\WINDOWS\system32\cmd.exe' +CYGWIN=notty +DIRSTACK=() +DISPLAY=:0 +EDHELP=/home/kern/bin/ed.hlp +EDTRM=/home/kern/bin/ed.trm +EUID=1007 +GROUPS=() +HISTFILE=/cygdrive/c/home/kern/.bash_history +HISTFILESIZE=500 +HISTSIZE=500 +HOME=/cygdrive/c/home/kern +HOMEDRIVE=C: +HOMEPATH='\Documents and Settings\kern' +HOSTNAME=Tibs +HOSTTYPE=i686 +IFS=$' \t\n' +INCLUDE='C:\Program Files\Microsoft SDK\Include\.;C:\Program Files\Microsoft Visual Studio\VC98\atl\include;C:\Program Files\Microsoft Visual Studio\VC98\mfc\include;C:\Program Files\Microsoft Visual Studio\VC98\include' +INETSDK='C:\Program Files\Microsoft SDK\.' +LIB='C:\Program Files\Microsoft SDK\Lib\.;C:\Program Files\Microsoft Visual Studio\VC98\mfc\lib;C:\Program Files\Microsoft Visual Studio\VC98\lib' +LINES=65 +LOGONSERVER='\\TIBS' +MACHTYPE=i686-pc-cygwin +MAILCHECK=60 +MAKE_MODE=UNIX +MOZILLA_HOME=/home/netscape +MSDEVDIR='C:\Program Files\Microsoft Visual Studio\Common\MSDev98' +MSSDK='C:\Program Files\Microsoft SDK\.' +MSTOOLS='C:\Program Files\Microsoft SDK\.' +NUMBER_OF_PROCESSORS=1 +OLDPWD=/home/kern/bacula +OPTERR=1 +OPTIND=1 +OS=Windows_NT +OSTYPE=cygwin +PATH='/cygdrive/c/Program Files/Microsoft Visual Studio/VC98/Bin:/cygdrive/c/Program Files/Microsoft Visual Studio/VC98:/cygdrive/c/Program Files/Microsoft Visual Studio/Common/MSDev98/Bin:/cygdrive/c/Program Files/Microsoft Visual Studio/Common/Tools/WinNT:/cygdrive/c/Program Files/Microsoft Visual Studio/Common/Tools:c:/cygwin/bin:/usr/bin:/home/kern/bin:/sbin:/usr/sbin:' +PATHEXT='.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH' +PIPESTATUS=([0]="0") +PPID=3864 +PROCESSOR_ARCHITECTURE=x86 +PROCESSOR_IDENTIFIER='x86 Family 15 Model 2 Stepping 7, GenuineIntel' +PROCESSOR_LEVEL=15 +PROCESSOR_REVISION=0207 +PROGRAMFILES='C:\Program Files' +PROMPT='$P$G' +PS1='\e[34m\]\w\[\e[0m\]$\040' +PS2='> ' +PS4='+ ' +PWD=/home/kern +SESSIONNAME=Console +SHELL=/bin/bash +SHELLOPTS=braceexpand:emacs:hashall:histexpand:history:interactive-comments:monitor +SHLVL=1 +SYSTEMDRIVE=C: +SYSTEMROOT='C:\WINDOWS' +TEMP=/cygdrive/c/DOCUME~1/kern/LOCALS~1/Temp +TERM=xterm +TMP=/cygdrive/c/DOCUME~1/kern/LOCALS~1/Temp +UID=1007 +USERDOMAIN=TIBS +USERNAME=kern +USERPROFILE='C:\Documents and Settings\kern' +WINDIR='C:\WINDOWS' +WINDOWID=168050736 +WXWIN='c:\home\kern\bacula\depkgs-win32\wx' +_=set diff --git a/bacula/src/win32/wx-console/filelist b/bacula/src/win32/wx-console/filelist index 9880336ab..b8bccdca1 100644 --- a/bacula/src/win32/wx-console/filelist +++ b/bacula/src/win32/wx-console/filelist @@ -32,7 +32,7 @@ ..\lib\sha1 ..\lib\signal ..\lib\smartall -..\lib\timers +..\lib\btimers ..\lib\tree ..\lib\util ..\lib\var diff --git a/bacula/src/win32/wx-console/wx-console.mak b/bacula/src/win32/wx-console/wx-console.mak index 869950ab8..d3f0ac548 100644 --- a/bacula/src/win32/wx-console/wx-console.mak +++ b/bacula/src/win32/wx-console/wx-console.mak @@ -40,61 +40,61 @@ ALL : "$(OUTDIR)\wx-console.exe" CLEAN : - -@erase "$(INTDIR)\alist.obj" - -@erase "$(INTDIR)\alloc.obj" - -@erase "$(INTDIR)\attr.obj" - -@erase "$(INTDIR)\base64.obj" - -@erase "$(INTDIR)\bget_msg.obj" - -@erase "$(INTDIR)\bnet.obj" - -@erase "$(INTDIR)\bnet_pkt.obj" - -@erase "$(INTDIR)\bnet_server.obj" - -@erase "$(INTDIR)\bshm.obj" - -@erase "$(INTDIR)\bsys.obj" - -@erase "$(INTDIR)\btime.obj" - -@erase "$(INTDIR)\cram-md5.obj" - -@erase "$(INTDIR)\crc32.obj" - -@erase "$(INTDIR)\daemon.obj" - -@erase "$(INTDIR)\dlist.obj" - -@erase "$(INTDIR)\edit.obj" - -@erase "$(INTDIR)\fnmatch.obj" - -@erase "$(INTDIR)\hmac.obj" - -@erase "$(INTDIR)\htable.obj" - -@erase "$(INTDIR)\idcache.obj" - -@erase "$(INTDIR)\jcr.obj" - -@erase "$(INTDIR)\lex.obj" - -@erase "$(INTDIR)\md5.obj" - -@erase "$(INTDIR)\mem_pool.obj" - -@erase "$(INTDIR)\message.obj" - -@erase "$(INTDIR)\parse_conf.obj" - -@erase "$(INTDIR)\queue.obj" - -@erase "$(INTDIR)\rwlock.obj" - -@erase "$(INTDIR)\scan.obj" - -@erase "$(INTDIR)\semlock.obj" - -@erase "$(INTDIR)\serial.obj" - -@erase "$(INTDIR)\sha1.obj" - -@erase "$(INTDIR)\signal.obj" - -@erase "$(INTDIR)\smartall.obj" - -@erase "$(INTDIR)\timers.obj" - -@erase "$(INTDIR)\tree.obj" - -@erase "$(INTDIR)\util.obj" - -@erase "$(INTDIR)\var.obj" - -@erase "$(INTDIR)\watchdog.obj" - -@erase "$(INTDIR)\workq.obj" - -@erase "$(INTDIR)\compat.obj" - -@erase "$(INTDIR)\print.obj" - -@erase "$(INTDIR)\authenticate.obj" - -@erase "$(INTDIR)\console_conf.obj" - -@erase "$(INTDIR)\console_thread.obj" - -@erase "$(INTDIR)\main.obj" - -@erase "$(INTDIR)\wxblistctrl.obj" - -@erase "$(INTDIR)\wxbmainframe.obj" - -@erase "$(INTDIR)\wxbrestorepanel.obj" - -@erase "$(INTDIR)\wxbtableparser.obj" - -@erase "$(INTDIR)\wxbtreectrl.obj" - -@erase "$(INTDIR)\wxbutils.obj" - -@erase "$(INTDIR)\wxbconfigpanel.obj" - -@erase "$(INTDIR)\wxbconfigfileeditor.obj" - -@erase "$(INTDIR)\wxbhistorytextctrl.obj" + -@erase "$(INTDIR)\alist.obj" + -@erase "$(INTDIR)\alloc.obj" + -@erase "$(INTDIR)\attr.obj" + -@erase "$(INTDIR)\base64.obj" + -@erase "$(INTDIR)\bget_msg.obj" + -@erase "$(INTDIR)\bnet.obj" + -@erase "$(INTDIR)\bnet_pkt.obj" + -@erase "$(INTDIR)\bnet_server.obj" + -@erase "$(INTDIR)\bshm.obj" + -@erase "$(INTDIR)\bsys.obj" + -@erase "$(INTDIR)\btime.obj" + -@erase "$(INTDIR)\cram-md5.obj" + -@erase "$(INTDIR)\crc32.obj" + -@erase "$(INTDIR)\daemon.obj" + -@erase "$(INTDIR)\dlist.obj" + -@erase "$(INTDIR)\edit.obj" + -@erase "$(INTDIR)\fnmatch.obj" + -@erase "$(INTDIR)\hmac.obj" + -@erase "$(INTDIR)\htable.obj" + -@erase "$(INTDIR)\idcache.obj" + -@erase "$(INTDIR)\jcr.obj" + -@erase "$(INTDIR)\lex.obj" + -@erase "$(INTDIR)\md5.obj" + -@erase "$(INTDIR)\mem_pool.obj" + -@erase "$(INTDIR)\message.obj" + -@erase "$(INTDIR)\parse_conf.obj" + -@erase "$(INTDIR)\queue.obj" + -@erase "$(INTDIR)\rwlock.obj" + -@erase "$(INTDIR)\scan.obj" + -@erase "$(INTDIR)\semlock.obj" + -@erase "$(INTDIR)\serial.obj" + -@erase "$(INTDIR)\sha1.obj" + -@erase "$(INTDIR)\signal.obj" + -@erase "$(INTDIR)\smartall.obj" + -@erase "$(INTDIR)\btimers.obj" + -@erase "$(INTDIR)\tree.obj" + -@erase "$(INTDIR)\util.obj" + -@erase "$(INTDIR)\var.obj" + -@erase "$(INTDIR)\watchdog.obj" + -@erase "$(INTDIR)\workq.obj" + -@erase "$(INTDIR)\compat.obj" + -@erase "$(INTDIR)\print.obj" + -@erase "$(INTDIR)\authenticate.obj" + -@erase "$(INTDIR)\console_conf.obj" + -@erase "$(INTDIR)\console_thread.obj" + -@erase "$(INTDIR)\main.obj" + -@erase "$(INTDIR)\wxblistctrl.obj" + -@erase "$(INTDIR)\wxbmainframe.obj" + -@erase "$(INTDIR)\wxbrestorepanel.obj" + -@erase "$(INTDIR)\wxbtableparser.obj" + -@erase "$(INTDIR)\wxbtreectrl.obj" + -@erase "$(INTDIR)\wxbutils.obj" + -@erase "$(INTDIR)\wxbconfigpanel.obj" + -@erase "$(INTDIR)\wxbconfigfileeditor.obj" + -@erase "$(INTDIR)\wxbhistorytextctrl.obj" -@erase "$(OUTDIR)\wx-console.exe" "$(OUTDIR)" : @@ -112,61 +112,61 @@ LINK32_FLAGS=wxmsw.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib w wldap32.lib pthreadVCE.lib zlib.lib /nodefaultlib:libcmt.lib \ /nologo /subsystem:windows /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/wx/lib" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" LINK32_OBJS= \ - "$(INTDIR)\alist.obj" \ - "$(INTDIR)\alloc.obj" \ - "$(INTDIR)\attr.obj" \ - "$(INTDIR)\base64.obj" \ - "$(INTDIR)\bget_msg.obj" \ - "$(INTDIR)\bnet.obj" \ - "$(INTDIR)\bnet_pkt.obj" \ - "$(INTDIR)\bnet_server.obj" \ - "$(INTDIR)\bshm.obj" \ - "$(INTDIR)\bsys.obj" \ - "$(INTDIR)\btime.obj" \ - "$(INTDIR)\cram-md5.obj" \ - "$(INTDIR)\crc32.obj" \ - "$(INTDIR)\daemon.obj" \ - "$(INTDIR)\dlist.obj" \ - "$(INTDIR)\edit.obj" \ - "$(INTDIR)\fnmatch.obj" \ - "$(INTDIR)\hmac.obj" \ - "$(INTDIR)\htable.obj" \ - "$(INTDIR)\idcache.obj" \ - "$(INTDIR)\jcr.obj" \ - "$(INTDIR)\lex.obj" \ - "$(INTDIR)\md5.obj" \ - "$(INTDIR)\mem_pool.obj" \ - "$(INTDIR)\message.obj" \ - "$(INTDIR)\parse_conf.obj" \ - "$(INTDIR)\queue.obj" \ - "$(INTDIR)\rwlock.obj" \ - "$(INTDIR)\scan.obj" \ - "$(INTDIR)\semlock.obj" \ - "$(INTDIR)\serial.obj" \ - "$(INTDIR)\sha1.obj" \ - "$(INTDIR)\signal.obj" \ - "$(INTDIR)\smartall.obj" \ - "$(INTDIR)\timers.obj" \ - "$(INTDIR)\tree.obj" \ - "$(INTDIR)\util.obj" \ - "$(INTDIR)\var.obj" \ - "$(INTDIR)\watchdog.obj" \ - "$(INTDIR)\workq.obj" \ - "$(INTDIR)\compat.obj" \ - "$(INTDIR)\print.obj" \ - "$(INTDIR)\authenticate.obj" \ - "$(INTDIR)\console_conf.obj" \ - "$(INTDIR)\console_thread.obj" \ - "$(INTDIR)\main.obj" \ - "$(INTDIR)\wxblistctrl.obj" \ - "$(INTDIR)\wxbmainframe.obj" \ - "$(INTDIR)\wxbrestorepanel.obj" \ - "$(INTDIR)\wxbtableparser.obj" \ - "$(INTDIR)\wxbtreectrl.obj" \ - "$(INTDIR)\wxbutils.obj" \ - "$(INTDIR)\wxbconfigpanel.obj" \ - "$(INTDIR)\wxbconfigfileeditor.obj" \ - "$(INTDIR)\wxbhistorytextctrl.obj" \ + "$(INTDIR)\alist.obj" \ + "$(INTDIR)\alloc.obj" \ + "$(INTDIR)\attr.obj" \ + "$(INTDIR)\base64.obj" \ + "$(INTDIR)\bget_msg.obj" \ + "$(INTDIR)\bnet.obj" \ + "$(INTDIR)\bnet_pkt.obj" \ + "$(INTDIR)\bnet_server.obj" \ + "$(INTDIR)\bshm.obj" \ + "$(INTDIR)\bsys.obj" \ + "$(INTDIR)\btime.obj" \ + "$(INTDIR)\cram-md5.obj" \ + "$(INTDIR)\crc32.obj" \ + "$(INTDIR)\daemon.obj" \ + "$(INTDIR)\dlist.obj" \ + "$(INTDIR)\edit.obj" \ + "$(INTDIR)\fnmatch.obj" \ + "$(INTDIR)\hmac.obj" \ + "$(INTDIR)\htable.obj" \ + "$(INTDIR)\idcache.obj" \ + "$(INTDIR)\jcr.obj" \ + "$(INTDIR)\lex.obj" \ + "$(INTDIR)\md5.obj" \ + "$(INTDIR)\mem_pool.obj" \ + "$(INTDIR)\message.obj" \ + "$(INTDIR)\parse_conf.obj" \ + "$(INTDIR)\queue.obj" \ + "$(INTDIR)\rwlock.obj" \ + "$(INTDIR)\scan.obj" \ + "$(INTDIR)\semlock.obj" \ + "$(INTDIR)\serial.obj" \ + "$(INTDIR)\sha1.obj" \ + "$(INTDIR)\signal.obj" \ + "$(INTDIR)\smartall.obj" \ + "$(INTDIR)\btimers.obj" \ + "$(INTDIR)\tree.obj" \ + "$(INTDIR)\util.obj" \ + "$(INTDIR)\var.obj" \ + "$(INTDIR)\watchdog.obj" \ + "$(INTDIR)\workq.obj" \ + "$(INTDIR)\compat.obj" \ + "$(INTDIR)\print.obj" \ + "$(INTDIR)\authenticate.obj" \ + "$(INTDIR)\console_conf.obj" \ + "$(INTDIR)\console_thread.obj" \ + "$(INTDIR)\main.obj" \ + "$(INTDIR)\wxblistctrl.obj" \ + "$(INTDIR)\wxbmainframe.obj" \ + "$(INTDIR)\wxbrestorepanel.obj" \ + "$(INTDIR)\wxbtableparser.obj" \ + "$(INTDIR)\wxbtreectrl.obj" \ + "$(INTDIR)\wxbutils.obj" \ + "$(INTDIR)\wxbconfigpanel.obj" \ + "$(INTDIR)\wxbconfigfileeditor.obj" \ + "$(INTDIR)\wxbhistorytextctrl.obj" \ "$(INTDIR)\wx-console_private.res" "$(OUTDIR)\wx-console.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -185,116 +185,116 @@ OutDir=.\Debug ALL : "$(OUTDIR)\wx-console.exe" "$(OUTDIR)\wx-console.bsc" CLEAN : - -@erase "$(INTDIR)\alist.obj - -@erase "$(INTDIR)\alist.sbr" - -@erase "$(INTDIR)\alloc.obj - -@erase "$(INTDIR)\alloc.sbr" - -@erase "$(INTDIR)\attr.obj - -@erase "$(INTDIR)\attr.sbr" - -@erase "$(INTDIR)\base64.obj - -@erase "$(INTDIR)\base64.sbr" - -@erase "$(INTDIR)\bget_msg.obj - -@erase "$(INTDIR)\bget_msg.sbr" - -@erase "$(INTDIR)\bnet.obj - -@erase "$(INTDIR)\bnet.sbr" - -@erase "$(INTDIR)\bnet_pkt.obj - -@erase "$(INTDIR)\bnet_pkt.sbr" - -@erase "$(INTDIR)\bnet_server.obj - -@erase "$(INTDIR)\bnet_server.sbr" - -@erase "$(INTDIR)\bshm.obj - -@erase "$(INTDIR)\bshm.sbr" - -@erase "$(INTDIR)\bsys.obj - -@erase "$(INTDIR)\bsys.sbr" - -@erase "$(INTDIR)\btime.obj - -@erase "$(INTDIR)\btime.sbr" - -@erase "$(INTDIR)\cram-md5.obj - -@erase "$(INTDIR)\cram-md5.sbr" - -@erase "$(INTDIR)\crc32.obj - -@erase "$(INTDIR)\crc32.sbr" - -@erase "$(INTDIR)\daemon.obj - -@erase "$(INTDIR)\daemon.sbr" - -@erase "$(INTDIR)\dlist.obj - -@erase "$(INTDIR)\dlist.sbr" - -@erase "$(INTDIR)\edit.obj - -@erase "$(INTDIR)\edit.sbr" - -@erase "$(INTDIR)\fnmatch.obj - -@erase "$(INTDIR)\fnmatch.sbr" - -@erase "$(INTDIR)\hmac.obj - -@erase "$(INTDIR)\hmac.sbr" - -@erase "$(INTDIR)\htable.obj - -@erase "$(INTDIR)\htable.sbr" - -@erase "$(INTDIR)\idcache.obj - -@erase "$(INTDIR)\idcache.sbr" - -@erase "$(INTDIR)\jcr.obj - -@erase "$(INTDIR)\jcr.sbr" - -@erase "$(INTDIR)\lex.obj - -@erase "$(INTDIR)\lex.sbr" - -@erase "$(INTDIR)\md5.obj - -@erase "$(INTDIR)\md5.sbr" - -@erase "$(INTDIR)\mem_pool.obj - -@erase "$(INTDIR)\mem_pool.sbr" - -@erase "$(INTDIR)\message.obj - -@erase "$(INTDIR)\message.sbr" - -@erase "$(INTDIR)\parse_conf.obj - -@erase "$(INTDIR)\parse_conf.sbr" - -@erase "$(INTDIR)\queue.obj - -@erase "$(INTDIR)\queue.sbr" - -@erase "$(INTDIR)\rwlock.obj - -@erase "$(INTDIR)\rwlock.sbr" - -@erase "$(INTDIR)\scan.obj - -@erase "$(INTDIR)\scan.sbr" - -@erase "$(INTDIR)\semlock.obj - -@erase "$(INTDIR)\semlock.sbr" - -@erase "$(INTDIR)\serial.obj - -@erase "$(INTDIR)\serial.sbr" - -@erase "$(INTDIR)\sha1.obj - -@erase "$(INTDIR)\sha1.sbr" - -@erase "$(INTDIR)\signal.obj - -@erase "$(INTDIR)\signal.sbr" - -@erase "$(INTDIR)\smartall.obj - -@erase "$(INTDIR)\smartall.sbr" - -@erase "$(INTDIR)\timers.obj - -@erase "$(INTDIR)\timers.sbr" - -@erase "$(INTDIR)\tree.obj - -@erase "$(INTDIR)\tree.sbr" - -@erase "$(INTDIR)\util.obj - -@erase "$(INTDIR)\util.sbr" - -@erase "$(INTDIR)\var.obj - -@erase "$(INTDIR)\var.sbr" - -@erase "$(INTDIR)\watchdog.obj - -@erase "$(INTDIR)\watchdog.sbr" - -@erase "$(INTDIR)\workq.obj - -@erase "$(INTDIR)\workq.sbr" - -@erase "$(INTDIR)\compat.obj - -@erase "$(INTDIR)\compat.sbr" - -@erase "$(INTDIR)\print.obj - -@erase "$(INTDIR)\print.sbr" - -@erase "$(INTDIR)\authenticate.obj - -@erase "$(INTDIR)\authenticate.sbr" - -@erase "$(INTDIR)\console_conf.obj - -@erase "$(INTDIR)\console_conf.sbr" - -@erase "$(INTDIR)\console_thread.obj - -@erase "$(INTDIR)\console_thread.sbr" - -@erase "$(INTDIR)\main.obj - -@erase "$(INTDIR)\main.sbr" - -@erase "$(INTDIR)\wxblistctrl.obj - -@erase "$(INTDIR)\wxblistctrl.sbr" - -@erase "$(INTDIR)\wxbmainframe.obj - -@erase "$(INTDIR)\wxbmainframe.sbr" - -@erase "$(INTDIR)\wxbrestorepanel.obj - -@erase "$(INTDIR)\wxbrestorepanel.sbr" - -@erase "$(INTDIR)\wxbtableparser.obj - -@erase "$(INTDIR)\wxbtableparser.sbr" - -@erase "$(INTDIR)\wxbtreectrl.obj - -@erase "$(INTDIR)\wxbtreectrl.sbr" - -@erase "$(INTDIR)\wxbutils.obj - -@erase "$(INTDIR)\wxbutils.sbr" - -@erase "$(INTDIR)\wxbconfigpanel.obj - -@erase "$(INTDIR)\wxbconfigpanel.sbr" - -@erase "$(INTDIR)\wxbconfigfileeditor.obj - -@erase "$(INTDIR)\wxbconfigfileeditor.sbr" - -@erase "$(INTDIR)\wxbhistorytextctrl.obj - -@erase "$(INTDIR)\wxbhistorytextctrl.sbr" + -@erase "$(INTDIR)\alist.obj + -@erase "$(INTDIR)\alist.sbr" + -@erase "$(INTDIR)\alloc.obj + -@erase "$(INTDIR)\alloc.sbr" + -@erase "$(INTDIR)\attr.obj + -@erase "$(INTDIR)\attr.sbr" + -@erase "$(INTDIR)\base64.obj + -@erase "$(INTDIR)\base64.sbr" + -@erase "$(INTDIR)\bget_msg.obj + -@erase "$(INTDIR)\bget_msg.sbr" + -@erase "$(INTDIR)\bnet.obj + -@erase "$(INTDIR)\bnet.sbr" + -@erase "$(INTDIR)\bnet_pkt.obj + -@erase "$(INTDIR)\bnet_pkt.sbr" + -@erase "$(INTDIR)\bnet_server.obj + -@erase "$(INTDIR)\bnet_server.sbr" + -@erase "$(INTDIR)\bshm.obj + -@erase "$(INTDIR)\bshm.sbr" + -@erase "$(INTDIR)\bsys.obj + -@erase "$(INTDIR)\bsys.sbr" + -@erase "$(INTDIR)\btime.obj + -@erase "$(INTDIR)\btime.sbr" + -@erase "$(INTDIR)\cram-md5.obj + -@erase "$(INTDIR)\cram-md5.sbr" + -@erase "$(INTDIR)\crc32.obj + -@erase "$(INTDIR)\crc32.sbr" + -@erase "$(INTDIR)\daemon.obj + -@erase "$(INTDIR)\daemon.sbr" + -@erase "$(INTDIR)\dlist.obj + -@erase "$(INTDIR)\dlist.sbr" + -@erase "$(INTDIR)\edit.obj + -@erase "$(INTDIR)\edit.sbr" + -@erase "$(INTDIR)\fnmatch.obj + -@erase "$(INTDIR)\fnmatch.sbr" + -@erase "$(INTDIR)\hmac.obj + -@erase "$(INTDIR)\hmac.sbr" + -@erase "$(INTDIR)\htable.obj + -@erase "$(INTDIR)\htable.sbr" + -@erase "$(INTDIR)\idcache.obj + -@erase "$(INTDIR)\idcache.sbr" + -@erase "$(INTDIR)\jcr.obj + -@erase "$(INTDIR)\jcr.sbr" + -@erase "$(INTDIR)\lex.obj + -@erase "$(INTDIR)\lex.sbr" + -@erase "$(INTDIR)\md5.obj + -@erase "$(INTDIR)\md5.sbr" + -@erase "$(INTDIR)\mem_pool.obj + -@erase "$(INTDIR)\mem_pool.sbr" + -@erase "$(INTDIR)\message.obj + -@erase "$(INTDIR)\message.sbr" + -@erase "$(INTDIR)\parse_conf.obj + -@erase "$(INTDIR)\parse_conf.sbr" + -@erase "$(INTDIR)\queue.obj + -@erase "$(INTDIR)\queue.sbr" + -@erase "$(INTDIR)\rwlock.obj + -@erase "$(INTDIR)\rwlock.sbr" + -@erase "$(INTDIR)\scan.obj + -@erase "$(INTDIR)\scan.sbr" + -@erase "$(INTDIR)\semlock.obj + -@erase "$(INTDIR)\semlock.sbr" + -@erase "$(INTDIR)\serial.obj + -@erase "$(INTDIR)\serial.sbr" + -@erase "$(INTDIR)\sha1.obj + -@erase "$(INTDIR)\sha1.sbr" + -@erase "$(INTDIR)\signal.obj + -@erase "$(INTDIR)\signal.sbr" + -@erase "$(INTDIR)\smartall.obj + -@erase "$(INTDIR)\smartall.sbr" + -@erase "$(INTDIR)\btimers.obj + -@erase "$(INTDIR)\btimers.sbr" + -@erase "$(INTDIR)\tree.obj + -@erase "$(INTDIR)\tree.sbr" + -@erase "$(INTDIR)\util.obj + -@erase "$(INTDIR)\util.sbr" + -@erase "$(INTDIR)\var.obj + -@erase "$(INTDIR)\var.sbr" + -@erase "$(INTDIR)\watchdog.obj + -@erase "$(INTDIR)\watchdog.sbr" + -@erase "$(INTDIR)\workq.obj + -@erase "$(INTDIR)\workq.sbr" + -@erase "$(INTDIR)\compat.obj + -@erase "$(INTDIR)\compat.sbr" + -@erase "$(INTDIR)\print.obj + -@erase "$(INTDIR)\print.sbr" + -@erase "$(INTDIR)\authenticate.obj + -@erase "$(INTDIR)\authenticate.sbr" + -@erase "$(INTDIR)\console_conf.obj + -@erase "$(INTDIR)\console_conf.sbr" + -@erase "$(INTDIR)\console_thread.obj + -@erase "$(INTDIR)\console_thread.sbr" + -@erase "$(INTDIR)\main.obj + -@erase "$(INTDIR)\main.sbr" + -@erase "$(INTDIR)\wxblistctrl.obj + -@erase "$(INTDIR)\wxblistctrl.sbr" + -@erase "$(INTDIR)\wxbmainframe.obj + -@erase "$(INTDIR)\wxbmainframe.sbr" + -@erase "$(INTDIR)\wxbrestorepanel.obj + -@erase "$(INTDIR)\wxbrestorepanel.sbr" + -@erase "$(INTDIR)\wxbtableparser.obj + -@erase "$(INTDIR)\wxbtableparser.sbr" + -@erase "$(INTDIR)\wxbtreectrl.obj + -@erase "$(INTDIR)\wxbtreectrl.sbr" + -@erase "$(INTDIR)\wxbutils.obj + -@erase "$(INTDIR)\wxbutils.sbr" + -@erase "$(INTDIR)\wxbconfigpanel.obj + -@erase "$(INTDIR)\wxbconfigpanel.sbr" + -@erase "$(INTDIR)\wxbconfigfileeditor.obj + -@erase "$(INTDIR)\wxbconfigfileeditor.sbr" + -@erase "$(INTDIR)\wxbhistorytextctrl.obj + -@erase "$(INTDIR)\wxbhistorytextctrl.sbr" -@erase "$(OUTDIR)\wx-console.exe" -@erase "$(OUTDIR)\wx-console.bsc" @@ -307,61 +307,61 @@ RSC_PROJ=/l 0x409 /fo"$(INTDIR)\winres.res" /d "_DEBUG" BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\wx-console.bsc" BSC32_SBRS= \ - "$(INTDIR)\alist.sbr" \ - "$(INTDIR)\alloc.sbr" \ - "$(INTDIR)\attr.sbr" \ - "$(INTDIR)\base64.sbr" \ - "$(INTDIR)\bget_msg.sbr" \ - "$(INTDIR)\bnet.sbr" \ - "$(INTDIR)\bnet_pkt.sbr" \ - "$(INTDIR)\bnet_server.sbr" \ - "$(INTDIR)\bshm.sbr" \ - "$(INTDIR)\bsys.sbr" \ - "$(INTDIR)\btime.sbr" \ - "$(INTDIR)\cram-md5.sbr" \ - "$(INTDIR)\crc32.sbr" \ - "$(INTDIR)\daemon.sbr" \ - "$(INTDIR)\dlist.sbr" \ - "$(INTDIR)\edit.sbr" \ - "$(INTDIR)\fnmatch.sbr" \ - "$(INTDIR)\hmac.sbr" \ - "$(INTDIR)\htable.sbr" \ - "$(INTDIR)\idcache.sbr" \ - "$(INTDIR)\jcr.sbr" \ - "$(INTDIR)\lex.sbr" \ - "$(INTDIR)\md5.sbr" \ - "$(INTDIR)\mem_pool.sbr" \ - "$(INTDIR)\message.sbr" \ - "$(INTDIR)\parse_conf.sbr" \ - "$(INTDIR)\queue.sbr" \ - "$(INTDIR)\rwlock.sbr" \ - "$(INTDIR)\scan.sbr" \ - "$(INTDIR)\semlock.sbr" \ - "$(INTDIR)\serial.sbr" \ - "$(INTDIR)\sha1.sbr" \ - "$(INTDIR)\signal.sbr" \ - "$(INTDIR)\smartall.sbr" \ - "$(INTDIR)\timers.sbr" \ - "$(INTDIR)\tree.sbr" \ - "$(INTDIR)\util.sbr" \ - "$(INTDIR)\var.sbr" \ - "$(INTDIR)\watchdog.sbr" \ - "$(INTDIR)\workq.sbr" \ - "$(INTDIR)\compat.sbr" \ - "$(INTDIR)\print.sbr" \ - "$(INTDIR)\authenticate.sbr" \ - "$(INTDIR)\console_conf.sbr" \ - "$(INTDIR)\console_thread.sbr" \ - "$(INTDIR)\main.sbr" \ - "$(INTDIR)\wxblistctrl.sbr" \ - "$(INTDIR)\wxbmainframe.sbr" \ - "$(INTDIR)\wxbrestorepanel.sbr" \ - "$(INTDIR)\wxbtableparser.sbr" \ - "$(INTDIR)\wxbtreectrl.sbr" \ - "$(INTDIR)\wxbutils.sbr" \ - "$(INTDIR)\wxbconfigpanel.sbr" \ - "$(INTDIR)\wxbconfigfileeditor.sbr" \ - "$(INTDIR)\wxbhistorytextctrl.sbr" \ + "$(INTDIR)\alist.sbr" \ + "$(INTDIR)\alloc.sbr" \ + "$(INTDIR)\attr.sbr" \ + "$(INTDIR)\base64.sbr" \ + "$(INTDIR)\bget_msg.sbr" \ + "$(INTDIR)\bnet.sbr" \ + "$(INTDIR)\bnet_pkt.sbr" \ + "$(INTDIR)\bnet_server.sbr" \ + "$(INTDIR)\bshm.sbr" \ + "$(INTDIR)\bsys.sbr" \ + "$(INTDIR)\btime.sbr" \ + "$(INTDIR)\cram-md5.sbr" \ + "$(INTDIR)\crc32.sbr" \ + "$(INTDIR)\daemon.sbr" \ + "$(INTDIR)\dlist.sbr" \ + "$(INTDIR)\edit.sbr" \ + "$(INTDIR)\fnmatch.sbr" \ + "$(INTDIR)\hmac.sbr" \ + "$(INTDIR)\htable.sbr" \ + "$(INTDIR)\idcache.sbr" \ + "$(INTDIR)\jcr.sbr" \ + "$(INTDIR)\lex.sbr" \ + "$(INTDIR)\md5.sbr" \ + "$(INTDIR)\mem_pool.sbr" \ + "$(INTDIR)\message.sbr" \ + "$(INTDIR)\parse_conf.sbr" \ + "$(INTDIR)\queue.sbr" \ + "$(INTDIR)\rwlock.sbr" \ + "$(INTDIR)\scan.sbr" \ + "$(INTDIR)\semlock.sbr" \ + "$(INTDIR)\serial.sbr" \ + "$(INTDIR)\sha1.sbr" \ + "$(INTDIR)\signal.sbr" \ + "$(INTDIR)\smartall.sbr" \ + "$(INTDIR)\btimers.sbr" \ + "$(INTDIR)\tree.sbr" \ + "$(INTDIR)\util.sbr" \ + "$(INTDIR)\var.sbr" \ + "$(INTDIR)\watchdog.sbr" \ + "$(INTDIR)\workq.sbr" \ + "$(INTDIR)\compat.sbr" \ + "$(INTDIR)\print.sbr" \ + "$(INTDIR)\authenticate.sbr" \ + "$(INTDIR)\console_conf.sbr" \ + "$(INTDIR)\console_thread.sbr" \ + "$(INTDIR)\main.sbr" \ + "$(INTDIR)\wxblistctrl.sbr" \ + "$(INTDIR)\wxbmainframe.sbr" \ + "$(INTDIR)\wxbrestorepanel.sbr" \ + "$(INTDIR)\wxbtableparser.sbr" \ + "$(INTDIR)\wxbtreectrl.sbr" \ + "$(INTDIR)\wxbutils.sbr" \ + "$(INTDIR)\wxbconfigpanel.sbr" \ + "$(INTDIR)\wxbconfigfileeditor.sbr" \ + "$(INTDIR)\wxbhistorytextctrl.sbr" \ "$(OUTDIR)\wx-console.bsc" : "$(OUTDIR)" $(BSC32_SBRS) $(BSC32) @<< @@ -374,61 +374,61 @@ LINK32_FLAGS=wxmswd.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib wldap32.lib pthreadVCE.lib zlib.lib /nodefaultlib:libcmtd.lib \ /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/wx/lib" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" LINK32_OBJS= \ - "$(INTDIR)\alist.obj" \ - "$(INTDIR)\alloc.obj" \ - "$(INTDIR)\attr.obj" \ - "$(INTDIR)\base64.obj" \ - "$(INTDIR)\bget_msg.obj" \ - "$(INTDIR)\bnet.obj" \ - "$(INTDIR)\bnet_pkt.obj" \ - "$(INTDIR)\bnet_server.obj" \ - "$(INTDIR)\bshm.obj" \ - "$(INTDIR)\bsys.obj" \ - "$(INTDIR)\btime.obj" \ - "$(INTDIR)\cram-md5.obj" \ - "$(INTDIR)\crc32.obj" \ - "$(INTDIR)\daemon.obj" \ - "$(INTDIR)\dlist.obj" \ - "$(INTDIR)\edit.obj" \ - "$(INTDIR)\fnmatch.obj" \ - "$(INTDIR)\hmac.obj" \ - "$(INTDIR)\htable.obj" \ - "$(INTDIR)\idcache.obj" \ - "$(INTDIR)\jcr.obj" \ - "$(INTDIR)\lex.obj" \ - "$(INTDIR)\md5.obj" \ - "$(INTDIR)\mem_pool.obj" \ - "$(INTDIR)\message.obj" \ - "$(INTDIR)\parse_conf.obj" \ - "$(INTDIR)\queue.obj" \ - "$(INTDIR)\rwlock.obj" \ - "$(INTDIR)\scan.obj" \ - "$(INTDIR)\semlock.obj" \ - "$(INTDIR)\serial.obj" \ - "$(INTDIR)\sha1.obj" \ - "$(INTDIR)\signal.obj" \ - "$(INTDIR)\smartall.obj" \ - "$(INTDIR)\timers.obj" \ - "$(INTDIR)\tree.obj" \ - "$(INTDIR)\util.obj" \ - "$(INTDIR)\var.obj" \ - "$(INTDIR)\watchdog.obj" \ - "$(INTDIR)\workq.obj" \ - "$(INTDIR)\compat.obj" \ - "$(INTDIR)\print.obj" \ - "$(INTDIR)\authenticate.obj" \ - "$(INTDIR)\console_conf.obj" \ - "$(INTDIR)\console_thread.obj" \ - "$(INTDIR)\main.obj" \ - "$(INTDIR)\wxblistctrl.obj" \ - "$(INTDIR)\wxbmainframe.obj" \ - "$(INTDIR)\wxbrestorepanel.obj" \ - "$(INTDIR)\wxbtableparser.obj" \ - "$(INTDIR)\wxbtreectrl.obj" \ - "$(INTDIR)\wxbutils.obj" \ - "$(INTDIR)\wxbconfigpanel.obj" \ - "$(INTDIR)\wxbconfigfileeditor.obj" \ - "$(INTDIR)\wxbhistorytextctrl.obj" \ + "$(INTDIR)\alist.obj" \ + "$(INTDIR)\alloc.obj" \ + "$(INTDIR)\attr.obj" \ + "$(INTDIR)\base64.obj" \ + "$(INTDIR)\bget_msg.obj" \ + "$(INTDIR)\bnet.obj" \ + "$(INTDIR)\bnet_pkt.obj" \ + "$(INTDIR)\bnet_server.obj" \ + "$(INTDIR)\bshm.obj" \ + "$(INTDIR)\bsys.obj" \ + "$(INTDIR)\btime.obj" \ + "$(INTDIR)\cram-md5.obj" \ + "$(INTDIR)\crc32.obj" \ + "$(INTDIR)\daemon.obj" \ + "$(INTDIR)\dlist.obj" \ + "$(INTDIR)\edit.obj" \ + "$(INTDIR)\fnmatch.obj" \ + "$(INTDIR)\hmac.obj" \ + "$(INTDIR)\htable.obj" \ + "$(INTDIR)\idcache.obj" \ + "$(INTDIR)\jcr.obj" \ + "$(INTDIR)\lex.obj" \ + "$(INTDIR)\md5.obj" \ + "$(INTDIR)\mem_pool.obj" \ + "$(INTDIR)\message.obj" \ + "$(INTDIR)\parse_conf.obj" \ + "$(INTDIR)\queue.obj" \ + "$(INTDIR)\rwlock.obj" \ + "$(INTDIR)\scan.obj" \ + "$(INTDIR)\semlock.obj" \ + "$(INTDIR)\serial.obj" \ + "$(INTDIR)\sha1.obj" \ + "$(INTDIR)\signal.obj" \ + "$(INTDIR)\smartall.obj" \ + "$(INTDIR)\btimers.obj" \ + "$(INTDIR)\tree.obj" \ + "$(INTDIR)\util.obj" \ + "$(INTDIR)\var.obj" \ + "$(INTDIR)\watchdog.obj" \ + "$(INTDIR)\workq.obj" \ + "$(INTDIR)\compat.obj" \ + "$(INTDIR)\print.obj" \ + "$(INTDIR)\authenticate.obj" \ + "$(INTDIR)\console_conf.obj" \ + "$(INTDIR)\console_thread.obj" \ + "$(INTDIR)\main.obj" \ + "$(INTDIR)\wxblistctrl.obj" \ + "$(INTDIR)\wxbmainframe.obj" \ + "$(INTDIR)\wxbrestorepanel.obj" \ + "$(INTDIR)\wxbtableparser.obj" \ + "$(INTDIR)\wxbtreectrl.obj" \ + "$(INTDIR)\wxbutils.obj" \ + "$(INTDIR)\wxbconfigpanel.obj" \ + "$(INTDIR)\wxbconfigfileeditor.obj" \ + "$(INTDIR)\wxbhistorytextctrl.obj" \ "$(INTDIR)\wx-console_private.res" "$(OUTDIR)\wx-console.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -488,14 +488,14 @@ SOURCE=..\lib\alist.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -507,14 +507,14 @@ SOURCE=..\lib\alloc.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -526,14 +526,14 @@ SOURCE=..\lib\attr.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -545,14 +545,14 @@ SOURCE=..\lib\base64.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -564,14 +564,14 @@ SOURCE=..\lib\bget_msg.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -583,14 +583,14 @@ SOURCE=..\lib\bnet.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -602,14 +602,14 @@ SOURCE=..\lib\bnet_pkt.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -621,14 +621,14 @@ SOURCE=..\lib\bnet_server.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -640,14 +640,14 @@ SOURCE=..\lib\bshm.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -659,14 +659,14 @@ SOURCE=..\lib\bsys.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -678,14 +678,14 @@ SOURCE=..\lib\btime.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -697,14 +697,14 @@ SOURCE=..\lib\cram-md5.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -716,14 +716,14 @@ SOURCE=..\lib\crc32.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -735,14 +735,14 @@ SOURCE=..\lib\daemon.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -754,14 +754,14 @@ SOURCE=..\lib\dlist.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -773,14 +773,14 @@ SOURCE=..\lib\edit.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -792,14 +792,14 @@ SOURCE=..\lib\fnmatch.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -811,14 +811,14 @@ SOURCE=..\lib\hmac.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -830,14 +830,14 @@ SOURCE=..\lib\htable.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -849,14 +849,14 @@ SOURCE=..\lib\idcache.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -868,14 +868,14 @@ SOURCE=..\lib\jcr.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -887,14 +887,14 @@ SOURCE=..\lib\lex.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -906,14 +906,14 @@ SOURCE=..\lib\md5.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -925,14 +925,14 @@ SOURCE=..\lib\mem_pool.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -944,14 +944,14 @@ SOURCE=..\lib\message.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -963,14 +963,14 @@ SOURCE=..\lib\parse_conf.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -982,14 +982,14 @@ SOURCE=..\lib\queue.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1001,14 +1001,14 @@ SOURCE=..\lib\rwlock.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1020,14 +1020,14 @@ SOURCE=..\lib\scan.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1039,14 +1039,14 @@ SOURCE=..\lib\semlock.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1058,14 +1058,14 @@ SOURCE=..\lib\serial.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1077,14 +1077,14 @@ SOURCE=..\lib\sha1.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1096,14 +1096,14 @@ SOURCE=..\lib\signal.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1115,33 +1115,33 @@ SOURCE=..\lib\smartall.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF -FILENAME=timers -SOURCE=..\lib\timers.cpp +FILENAME=btimers +SOURCE=..\lib\btimers.cpp !IF "$(CFG)" == "wx-console - Win32 Release" "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1153,14 +1153,14 @@ SOURCE=..\lib\tree.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1172,14 +1172,14 @@ SOURCE=..\lib\util.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1191,14 +1191,14 @@ SOURCE=..\lib\var.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1210,14 +1210,14 @@ SOURCE=..\lib\watchdog.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1229,14 +1229,14 @@ SOURCE=..\lib\workq.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1248,14 +1248,14 @@ SOURCE=..\compat\compat.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1267,14 +1267,14 @@ SOURCE=..\compat\print.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1286,14 +1286,14 @@ SOURCE=.\authenticate.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1305,14 +1305,14 @@ SOURCE=.\console_conf.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1324,14 +1324,14 @@ SOURCE=..\..\wx-console\console_thread.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1343,14 +1343,14 @@ SOURCE=..\..\wx-console\main.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1362,14 +1362,14 @@ SOURCE=..\..\wx-console\wxblistctrl.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1381,14 +1381,14 @@ SOURCE=..\..\wx-console\wxbmainframe.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1400,14 +1400,14 @@ SOURCE=..\..\wx-console\wxbrestorepanel.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1419,14 +1419,14 @@ SOURCE=..\..\wx-console\wxbtableparser.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1438,14 +1438,14 @@ SOURCE=..\..\wx-console\wxbtreectrl.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1457,14 +1457,14 @@ SOURCE=..\..\wx-console\wxbutils.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1476,14 +1476,14 @@ SOURCE=..\..\wx-console\wxbconfigpanel.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1495,14 +1495,14 @@ SOURCE=..\..\wx-console\wxbconfigfileeditor.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF @@ -1514,17 +1514,16 @@ SOURCE=..\..\wx-console\wxbhistorytextctrl.cpp "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) + $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "wx-console - Win32 Debug" -"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(INTDIR)\$(FILENAME).obj" "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF - diff --git a/bacula/src/wx-console/wxbhistorytextctrl.cpp b/bacula/src/wx-console/wxbhistorytextctrl.cpp index b954cf4c7..9e282c6ac 100644 --- a/bacula/src/wx-console/wxbhistorytextctrl.cpp +++ b/bacula/src/wx-console/wxbhistorytextctrl.cpp @@ -70,4 +70,3 @@ void wxbHistoryTextCtrl::OnKeyUp(wxKeyEvent& event) { } } -