From 3f82e08bed52a1e3fb64f629e06ce986a372e074 Mon Sep 17 00:00:00 2001 From: jongfoster <jongfoster@users.sourceforge.net> Date: Sun, 15 Jul 2001 20:08:40 +0000 Subject: [PATCH] New build files for VC++ which provide the option of POSIX or Win32 threads. --- config.h.win | 11 +- config.h.win32threads.win | 322 ++++++++++++++++++++++++++++++++++++++ console_junkbuster.dsp | 115 +++++++++----- pcre/vc_dftables.dsp | 144 ++++++++++++++++- vc_junkbuster.dsp | 120 +++++++++----- 5 files changed, 635 insertions(+), 77 deletions(-) create mode 100644 config.h.win32threads.win diff --git a/config.h.win b/config.h.win index ee103e04..da2bbc6c 100755 --- a/config.h.win +++ b/config.h.win @@ -4,7 +4,7 @@ #define _CONFIG_H /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/config.h.in,v $ + * File : $Source: /cvsroot/ijbswa/current/config.h.win,v $ * * Purpose : This file should be the first thing included in every * .c file. (Before even system headers). It contains @@ -38,7 +38,12 @@ * Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * Revisions : - * $Log: config.h.in,v $ + * $Log: config.h.win,v $ + * Revision 1.5 2001/07/15 18:00:46 jongfoster + * Renaming STATIC to STATIC_PCRE. + * Replacing this file with one built by "configure" from + * "config.h.in", for consistency. + * * Revision 1.6 2001/07/15 17:54:29 jongfoster * Renaming #define STATIC to STATIC_PCRE * Adding new #define FEATURE_PTHREAD that will be used to enable @@ -295,7 +300,7 @@ /* * Use POSIX threads instead of native threads. */ -/* #undef FEATURE_PTHREAD */ +#define FEATURE_PTHREAD 1 /* Define if you have the bcopy function. */ #define HAVE_BCOPY 1 diff --git a/config.h.win32threads.win b/config.h.win32threads.win new file mode 100644 index 00000000..43c37bbd --- /dev/null +++ b/config.h.win32threads.win @@ -0,0 +1,322 @@ +/* config.h. Generated automatically by configure. */ +/* config.h.in. Generated automatically from configure.in by autoheader. */ +#ifndef _CONFIG_H +#define _CONFIG_H +/********************************************************************* + * + * File : $Source: /cvsroot/ijbswa/current/config.h.win,v $ + * + * Purpose : This file should be the first thing included in every + * .c file. (Before even system headers). It contains + * #define statements for various features. It was + * introduced because the compile command line started + * getting ludicrously long with feature defines. + * + * Copyright : Written by and Copyright (C) 2001 the SourceForge + * IJBSWA team. http://ijbswa.sourceforge.net + * + * Based on the Internet Junkbuster originally written + * by and Copyright (C) 1997 Anonymous Coders and + * Junkbusters Corporation. http://www.junkbusters.com + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General + * Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will + * be useful, but WITHOUT ANY WARRANTY; without even the + * implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * The GNU General Public License should be included with + * this file. If not, you can view it at + * http://www.gnu.org/copyleft/gpl.html + * or write to the Free Software Foundation, Inc., 59 + * Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Revisions : + * $Log: config.h.win,v $ + * Revision 1.5 2001/07/15 18:00:46 jongfoster + * Renaming STATIC to STATIC_PCRE. + * Replacing this file with one built by "configure" from + * "config.h.in", for consistency. + * + * Revision 1.6 2001/07/15 17:54:29 jongfoster + * Renaming #define STATIC to STATIC_PCRE + * Adding new #define FEATURE_PTHREAD that will be used to enable + * POSIX threads support. + * + * Revision 1.5 2001/07/13 13:48:37 oes + * - (Fix:) Copied CODE_STATUS #define from config.h.in + * - split REGEX #define into REGEX_GNU and REGEX_PCRE + * and removed PCRE. + * (REGEX = REGEX_GNU || REGEX_PCRE per project.h) + * - Moved STATIC (for pcre) here from Makefile.in + * - Introduced STATIC_PCRS #define to allow for dynaimc linking with + * libpcrs + * - Removed PCRS #define, since pcrs is now needed for CGI anyway + * + * Revision 1.4 2001/05/29 09:50:24 jongfoster + * Unified blocklist/imagelist/permissionslist. + * File format is still under discussion, but the internal changes + * are (mostly) done. + * + * Also modified interceptor behaviour: + * - We now intercept all URLs beginning with one of the following + * prefixes (and *only* these prefixes): + * * http://i.j.b/ + * * http://ijbswa.sf.net/config/ + * * http://ijbswa.sourceforge.net/config/ + * - New interceptors "home page" - go to http://i.j.b/ to see it. + * - Internal changes so that intercepted and fast redirect pages + * are not replaced with an image. + * - Interceptors now have the option to send a binary page direct + * to the client. (i.e. ijb-send-banner uses this) + * - Implemented show-url-info interceptor. (Which is why I needed + * the above interceptors changes - a typical URL is + * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". + * The previous mechanism would not have intercepted that, and + * if it had been intercepted then it then it would have replaced + * it with an image.) + * + * Revision 1.3 2001/05/26 01:26:34 jongfoster + * New #define, WIN_GUI_EDIT, enables the (embryonic) Win32 GUI editor. + * This #define cannot be set from ./configure - there's no point, it + * doesn't work yet. See feature request # 425722 + * + * Revision 1.2 2001/05/22 17:43:35 oes + * + * - Enabled filtering banners by size rather than URL + * by adding patterns that replace all standard banner + * sizes with the "Junkbuster" gif to the re_filterfile + * + * - Enabled filtering WebBugs by providing a pattern + * which kills all 1x1 images + * + * - Added support for PCRE_UNGREEDY behaviour to pcrs, + * which is selected by the (nonstandard and therefore + * capital) letter 'U' in the option string. + * It causes the quantifiers to be ungreedy by default. + * Appending a ? turns back to greedy (!). + * + * - Added a new interceptor ijb-send-banner, which + * sends back the "Junkbuster" gif. Without imagelist or + * MSIE detection support, or if tinygif = 1, or the + * URL isn't recognized as an imageurl, a lame HTML + * explanation is sent instead. + * + * - Added new feature, which permits blocking remote + * script redirects and firing back a local redirect + * to the browser. + * The feature is conditionally compiled, i.e. it + * can be disabled with --disable-fast-redirects, + * plus it must be activated by a "fast-redirects" + * line in the config file, has its own log level + * and of course wants to be displayed by show-proxy-args + * Note: Boy, all the #ifdefs in 1001 locations and + * all the fumbling with configure.in and acconfig.h + * were *way* more work than the feature itself :-( + * + * - Because a generic redirect template was needed for + * this, tinygif = 3 now uses the same. + * + * - Moved GIFs, and other static HTTP response templates + * to project.h + * + * - Many minor fixes + * + * - Removed some >400 CRs again (Jon, you really worked + * a lot! ;-) + * + * Revision 1.1.1.1 2001/05/15 13:58:45 oes + * Initial import of version 2.9.3 source tree + * + * + *********************************************************************/ + + +/* Define to empty if the keyword does not work. */ +/* #undef const */ + +/* Define to `unsigned' if <sys/types.h> doesn't define. */ +/* #undef size_t */ + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* + * Version number - Major (X._._) + */ +#define VERSION_MAJOR 2 + +/* + * Version number - Minor (_.X._) + */ +#define VERSION_MINOR 9 + +/* + * Version number - Point (_._.X) + */ +#define VERSION_POINT 6 + +/* + * Version number, as a string + */ +#define VERSION "2.9.6" + +/* + * Status of the code: alpha, beta or stable + */ +#define CODE_STATUS "alpha" + +/* + * Regular expression matching for URLs. (Highly recommended). + * If neither of these are defined then you can ony use prefix matching. + * Don't bother to change this here! Use configure instead. + */ +/* #undef REGEX_GNU */ +#define REGEX_PCRE 1 + +/* + * Should pcre be statically built in instead of linkling with libpcre? + * (This is determined by configure depending on the availiability of + * libpcre and user preferences). The name is ugly, but pcre needs it. + * Don't bother to change this here! Use configure instead. + */ +#define STATIC_PCRE 1 + +/* + * Should pcrs be statically built in instead of linkling with libpcrs? + * (This is determined by configure depending on the availiability of + * libpcrs and user preferences). + * Don't bother to change this here! Use configure instead. + */ +#define STATIC_PCRS 1 + +/* + * Allow JunkBuster to be "disabled" so it is just a normal non-blocking + * non-anonymizing proxy. This is useful if you're trying to access a + * blocked or broken site - just change the setting in the config file + * and send a SIGHUP (UN*X), or use the handy "Disable" menu option (Windows + * GUI). + */ +#define TOGGLE 1 + +/* + * If a stream is compressed via gzip (Netscape specific I think), then + * it cannot be modified with Perl regexps. This forces it to be + * uncompressed. + */ +#define DENY_GZIP 1 + +/* + * Enables statistics function. + */ +#define STATISTICS 1 + +/* + * Bypass filtering for 1 page only + */ +#define FORCE_LOAD 1 + +/* + * Locally redirect remote script-redirect URLs + */ +#define FAST_REDIRECTS 1 + +/* + * Split the show-proxy-args page into a page for each config file. + */ +#define SPLIT_PROXY_ARGS 1 + +/* + * Kills JavaScript popups - window.open, onunload, etc. + */ +#define KILLPOPUPS 1 + +/* + * Support for webDAV - e.g. so Microsoft Outlook can access HotMail e-mail + */ +#define WEBDAV 1 + +/* + * Detect image requests automatically for MSIE. Will fall back to + * other image-detection methods (i.e. "+image" permission) for other + * browsers. + * + * You must also define IMAGE_BLOCKING to use this feature. + * + * It detects the following header pair as an image request: + * + * User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0) + * Accept: * / * + * + * And the following as a HTML request: + * + * User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0) + * Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, * / * + * + * And no, I haven't got that backwards - IE is being wierd. + * + * Known limitations: + * 1) If you press shift-reload on a blocked HTML page, you get + * the image "blocked" page, not the HTML "blocked" page. + * 2) Once an image "blocked" page has been sent, viewing it + * in it's own browser window *should* bring up the HTML + * "blocked" page, but it doesn't. You need to clear the + * browser cache to get the HTML version again. + * + * These limitations are due to IE making inconsistent choices + * about which "Accept:" header to send. + */ +#define DETECT_MSIE_IMAGES 1 + +/* + * Allow blocking using images as well as HTML. + * If you do not define this then everything is blocked as HTML. + * + * Note that this is required if you want to use DETECT_MSIE_IMAGES. + */ +#define IMAGE_BLOCKING 1 + +/* + * Allows the use of ACL files to control access to the proxy by IP address. + */ +#define ACL_FILES 1 + +/* + * Allows the use of trust files. + */ +#define TRUST_FILES 1 + +/* + * Allows the use of jar files to capture cookies. + */ +#define JAR_FILES 1 + +/* + * Use POSIX threads instead of native threads. + */ +/* #undef FEATURE_PTHREAD */ + +/* Define if you have the bcopy function. */ +#define HAVE_BCOPY 1 + +/* Define if you have the memmove function. */ +#define HAVE_MEMMOVE 1 + +/* Define if you have the strerror function. */ +#define HAVE_STRERROR 1 + +/* + * Need to set up this define only for the Pthreads library for + * Win32, available from http://sources.redhat.com/pthreads-win32/ + */ +#if defined(FEATURE_PTHREAD) && defined(_WIN32) +#define __CLEANUP_C +#endif /* defined(FEATURE_PTHREAD) && defined(_WIN32) */ + +#endif /* _CONFIG_H */ diff --git a/console_junkbuster.dsp b/console_junkbuster.dsp index 493fbcd4..7168d3b4 100755 --- a/console_junkbuster.dsp +++ b/console_junkbuster.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=console_junkbuster - Win32 Debug +CFG=console_junkbuster - Win32 Debug with Win32 threads !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -14,7 +14,7 @@ CFG=console_junkbuster - Win32 Debug !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "console_junkbuster.mak"\ - CFG="console_junkbuster - Win32 Debug" + CFG="console_junkbuster - Win32 Debug with Win32 threads" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -22,6 +22,10 @@ CFG=console_junkbuster - Win32 Debug "Win32 (x86) Console Application") !MESSAGE "console_junkbuster - Win32 Debug" (based on\ "Win32 (x86) Console Application") +!MESSAGE "console_junkbuster - Win32 Debug with Win32 threads" (based on\ + "Win32 (x86) Console Application") +!MESSAGE "console_junkbuster - Win32 Release with Win32 threads" (based on\ + "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -52,7 +56,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "console_junkbuster - Win32 Debug" @@ -76,14 +80,66 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ELSEIF "$(CFG)" == "console_junkbuster - Win32 Debug with Win32 threads" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "console_" +# PROP BASE Intermediate_Dir "console_" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "console_debug_winthr" +# PROP Intermediate_Dir "console_debug_winthr" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "pcre" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN_CONSOLE" /D "STATIC" /FR /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "pcre" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN_CONSOLE" /D "STATIC" /FR /YX /FD /c +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +!ELSEIF "$(CFG)" == "console_junkbuster - Win32 Release with Win32 threads" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "console0" +# PROP BASE Intermediate_Dir "console0" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "console_release_winthr" +# PROP Intermediate_Dir "console_release_winthr" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "pcre" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN_CONSOLE" /D "STATIC" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "pcre" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN_CONSOLE" /D "STATIC" /YX /FD /c +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib /nologo /subsystem:console /machine:I386 + !ENDIF # Begin Target # Name "console_junkbuster - Win32 Release" # Name "console_junkbuster - Win32 Debug" +# Name "console_junkbuster - Win32 Debug with Win32 threads" +# Name "console_junkbuster - Win32 Release with Win32 threads" # Begin Group "JunkBuster" # PROP Default_Filter "" @@ -198,42 +254,9 @@ SOURCE=.\showargs.h # End Group # Begin Group "Win32" -# PROP Default_Filter "" -# Begin Group "File Copy" - # PROP Default_Filter "" # Begin Source File -SOURCE=.\config.h.win - -!IF "$(CFG)" == "console_junkbuster - Win32 Release" - -# Begin Custom Build - Copying config.h.win -InputDir=. -InputPath=.\config.h.win - -"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" "$(InputDir)\config.h" - -# End Custom Build - -!ELSEIF "$(CFG)" == "console_junkbuster - Win32 Debug" - -# Begin Custom Build - Copying config.h.win -InputDir=. -InputPath=.\config.h.win - -"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" "$(InputDir)\config.h" - -# End Custom Build - -!ENDIF - -# End Source File -# End Group -# Begin Source File - SOURCE=.\cygwin.h # End Source File # Begin Source File @@ -251,7 +274,27 @@ SOURCE=.\win32.h # Begin Source File SOURCE=.\pcre\chartables.c + +!IF "$(CFG)" == "console_junkbuster - Win32 Release" + # PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "console_junkbuster - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "console_junkbuster - Win32 Debug with Win32 threads" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "console_junkbuster - Win32 Release with Win32 threads" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + +!ENDIF + # End Source File # Begin Source File diff --git a/pcre/vc_dftables.dsp b/pcre/vc_dftables.dsp index 2eb49861..a02add5b 100755 --- a/pcre/vc_dftables.dsp +++ b/pcre/vc_dftables.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=vc_dftables - Win32 Debug +CFG=vc_dftables - Win32 Debug with Win32 threads !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,8 @@ CFG=vc_dftables - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "vc_dftables.mak" CFG="vc_dftables - Win32 Debug" +!MESSAGE NMAKE /f "vc_dftables.mak"\ + CFG="vc_dftables - Win32 Debug with Win32 threads" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,6 +22,10 @@ CFG=vc_dftables - Win32 Debug "Win32 (x86) Console Application") !MESSAGE "vc_dftables - Win32 Debug" (based on\ "Win32 (x86) Console Application") +!MESSAGE "vc_dftables - Win32 Debug with Win32 threads" (based on\ + "Win32 (x86) Console Application") +!MESSAGE "vc_dftables - Win32 Release with Win32 threads" (based on\ + "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -88,12 +93,74 @@ PostBuild_Desc=Running program to generate chartables.c PostBuild_Cmds=$(OutDir)\vc_dftables.exe >$(OutDir)\..\chartables.c # End Special Build Tool +!ELSEIF "$(CFG)" == "vc_dftables - Win32 Debug with Win32 threads" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_dftab" +# PROP BASE Intermediate_Dir "vc_dftab" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_dftables_dbg" +# PROP Intermediate_Dir "vc_dftables_dbg" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +OutDir=.\vc_dftables_dbg +SOURCE=$(InputPath) +PostBuild_Desc=Running program to generate chartables.c +PostBuild_Cmds=$(OutDir)\vc_dftables.exe >$(OutDir)\..\chartables.c +# End Special Build Tool + +!ELSEIF "$(CFG)" == "vc_dftables - Win32 Release with Win32 threads" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_dfta0" +# PROP BASE Intermediate_Dir "vc_dfta0" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_dftables" +# PROP Intermediate_Dir "vc_dftables" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +OutDir=.\vc_dftables +SOURCE=$(InputPath) +PostBuild_Desc=Running program to generate chartables.c +PostBuild_Cmds=$(OutDir)\vc_dftables.exe >$(OutDir)\..\chartables.c +# End Special Build Tool + !ENDIF # Begin Target # Name "vc_dftables - Win32 Release" # Name "vc_dftables - Win32 Debug" +# Name "vc_dftables - Win32 Debug with Win32 threads" +# Name "vc_dftables - Win32 Release with Win32 threads" # Begin Group "File Copy" # PROP Default_Filter "" @@ -103,6 +170,7 @@ SOURCE=..\config.h.win !IF "$(CFG)" == "vc_dftables - Win32 Release" +# PROP Ignore_Default_Tool 1 # Begin Custom Build - Copying config.h.win WkspDir=. InputPath=..\config.h.win @@ -114,6 +182,7 @@ InputPath=..\config.h.win !ELSEIF "$(CFG)" == "vc_dftables - Win32 Debug" +# PROP Ignore_Default_Tool 1 # Begin Custom Build - Copying config.h.win WkspDir=. InputPath=..\config.h.win @@ -123,6 +192,57 @@ InputPath=..\config.h.win # End Custom Build +!ELSEIF "$(CFG)" == "vc_dftables - Win32 Debug with Win32 threads" + +# PROP Exclude_From_Build 1 +# PROP Ignore_Default_Tool 1 + +!ELSEIF "$(CFG)" == "vc_dftables - Win32 Release with Win32 threads" + +# PROP Exclude_From_Build 1 +# PROP Ignore_Default_Tool 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\config.h.win32threads.win + +!IF "$(CFG)" == "vc_dftables - Win32 Release" + +# PROP Exclude_From_Build 1 +# PROP Ignore_Default_Tool 1 + +!ELSEIF "$(CFG)" == "vc_dftables - Win32 Debug" + +# PROP Exclude_From_Build 1 +# PROP Ignore_Default_Tool 1 + +!ELSEIF "$(CFG)" == "vc_dftables - Win32 Debug with Win32 threads" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Copying config.h.win32threads.win +WkspDir=. +InputPath=..\config.h.win32threads.win + +"$(WkspDir)\..\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" "$(WkspDir)\..\config.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "vc_dftables - Win32 Release with Win32 threads" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Copying config.h.win32threads.win +WkspDir=. +InputPath=..\config.h.win32threads.win + +"$(WkspDir)\..\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" "$(WkspDir)\..\config.h" + +# End Custom Build + !ENDIF # End Source File @@ -146,7 +266,27 @@ SOURCE=.\internal.h # Begin Source File SOURCE=.\maketables.c + +!IF "$(CFG)" == "vc_dftables - Win32 Release" + # PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "vc_dftables - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "vc_dftables - Win32 Debug with Win32 threads" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "vc_dftables - Win32 Release with Win32 threads" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + +!ENDIF + # End Source File # Begin Source File diff --git a/vc_junkbuster.dsp b/vc_junkbuster.dsp index e3785174..e9c7503e 100644 --- a/vc_junkbuster.dsp +++ b/vc_junkbuster.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=vc_junkbuster - Win32 Release +CFG=vc_junkbuster - Win32 Debug with Win32 threads !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,17 @@ CFG=vc_junkbuster - Win32 Release !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "vc_junkbuster.mak" CFG="vc_junkbuster - Win32 Release" +!MESSAGE NMAKE /f "vc_junkbuster.mak"\ + CFG="vc_junkbuster - Win32 Debug with Win32 threads" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "vc_junkbuster - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "vc_junkbuster - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "vc_junkbuster - Win32 Release with Win32 threads" (based on\ + "Win32 (x86) Application") +!MESSAGE "vc_junkbuster - Win32 Debug with Win32 threads" (based on\ + "Win32 (x86) Application") !MESSAGE # Begin Project @@ -52,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:windows /machine:I386 !ELSEIF "$(CFG)" == "vc_junkbuster - Win32 Debug" @@ -78,6 +83,60 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept + +!ELSEIF "$(CFG)" == "vc_junkbuster - Win32 Release with Win32 threads" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_junkb" +# PROP BASE Intermediate_Dir "vc_junkb" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_release_winthr" +# PROP Intermediate_Dir "vc_release_winthr" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /Ob2 /I "pcre" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /FR /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /I "pcre" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /FR /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib /nologo /subsystem:windows /machine:I386 + +!ELSEIF "$(CFG)" == "vc_junkbuster - Win32 Debug with Win32 threads" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_junk0" +# PROP BASE Intermediate_Dir "vc_junk0" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_debug_winthr" +# PROP Intermediate_Dir "vc_debug_winthr" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /O2 /I "pcre" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /O2 /I "pcre" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept !ENDIF @@ -86,6 +145,8 @@ LINK32=link.exe # Name "vc_junkbuster - Win32 Release" # Name "vc_junkbuster - Win32 Debug" +# Name "vc_junkbuster - Win32 Release with Win32 threads" +# Name "vc_junkbuster - Win32 Debug with Win32 threads" # Begin Group "JunkBuster" # PROP Default_Filter "" @@ -201,39 +262,6 @@ SOURCE=.\showargs.h # Begin Group "Win32" # PROP Default_Filter "" -# Begin Group "File Copy" - -# PROP Default_Filter ".win" -# Begin Source File - -SOURCE=.\config.h.win - -!IF "$(CFG)" == "vc_junkbuster - Win32 Release" - -# Begin Custom Build - Copying config.h.win -InputDir=. -InputPath=.\config.h.win - -"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" "$(InputDir)\config.h" - -# End Custom Build - -!ELSEIF "$(CFG)" == "vc_junkbuster - Win32 Debug" - -# Begin Custom Build - Copying config.h.win -InputDir=. -InputPath=.\config.h.win - -"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" "$(InputDir)\config.h" - -# End Custom Build - -!ENDIF - -# End Source File -# End Group # Begin Source File SOURCE=.\cygwin.h @@ -337,7 +365,27 @@ SOURCE=.\w32.rc # Begin Source File SOURCE=.\pcre\chartables.c + +!IF "$(CFG)" == "vc_junkbuster - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "vc_junkbuster - Win32 Debug" + # PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "vc_junkbuster - Win32 Release with Win32 threads" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "vc_junkbuster - Win32 Debug with Win32 threads" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + +!ENDIF + # End Source File # Begin Source File -- 2.49.0