Changeset 1237

Show
Ignore:
Timestamp:
05/25/03 23:46:58 (5 years ago)
Author:
augur
Message:

Cleanup: removed targets we won't use, changed includes, removed linking to libpcre and libxml2 and remove HAVE_PCRE definition since that shouldn't matter in the search library (right?)... HAVE_PCRE seems to cause us to require a header from PCRE.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/swishctl/src/SwishCtl.dsp

    r1232 r1237  
    1919!MESSAGE  
    2020!MESSAGE "SwishCtl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") 
    21 !MESSAGE "SwishCtl - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") 
    2221!MESSAGE "SwishCtl - Win32 Release MinSize" (based on "Win32 (x86) Dynamic-Link Library") 
    23 !MESSAGE "SwishCtl - Win32 Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library") 
    24 !MESSAGE "SwishCtl - Win32 Unicode Release MinSize" (based on "Win32 (x86) Dynamic-Link Library") 
    25 !MESSAGE "SwishCtl - Win32 Unicode Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library") 
    2622!MESSAGE  
    2723 
    …… 
    4844# PROP Target_Dir "" 
    4945# ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c 
    50 # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\swish-e\src\Win32" /D "HAVE_PCRE" /D "HAVE_CONFIG_H" /D "HAVE_ZLIB" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /GZ /c 
     46# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\swish-e\src\Win32" /D "HAVE_CONFIG_H" /D "HAVE_ZLIB" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /GZ /c 
    5147# ADD BASE RSC /l 0x1409 /d "_DEBUG" 
    5248# ADD RSC /l 0x1409 /d "_DEBUG" 
    …… 
    5652LINK32=link.exe 
    5753# 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 /dll /debug /machine:I386 /pdbtype:sept 
    58 # 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 ../expat/xmltok/Debug/xmltok.lib ../expat/xmlparse/Debug/xmlparse.lib ../swish-e/src/win32/libswish-e.lib ../libxml2/win32/dsp/libxml2/libxml2.lib ../pcre/lib/libpcre.lib ../zlib/zlib.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept 
     54# 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 ../../swish-e/src/win32/libswish-e.lib ../../zlib/zlib.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept 
    5955# Begin Custom Build - Performing registration 
    6056OutDir=.\Debug 
    …… 
    6662        regsvr32 /s /c "$(TargetPath)"  
    6763        echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"  
    68          
    69 # End Custom Build 
    70  
    71 !ELSEIF  "$(CFG)" == "SwishCtl - Win32 Unicode Debug" 
    72  
    73 # PROP BASE Use_MFC 0 
    74 # PROP BASE Use_Debug_Libraries 1 
    75 # PROP BASE Output_Dir "DebugU" 
    76 # PROP BASE Intermediate_Dir "DebugU" 
    77 # PROP BASE Target_Dir "" 
    78 # PROP Use_MFC 0 
    79 # PROP Use_Debug_Libraries 1 
    80 # PROP Output_Dir "DebugU" 
    81 # PROP Intermediate_Dir "DebugU" 
    82 # PROP Ignore_Export_Lib 0 
    83 # PROP Target_Dir "" 
    84 # ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ /c 
    85 # ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "F:\dev\swish-e\src\Win32" /I "F:\dev\swish-e\src" /D "HAVE_PCRE" /D "HAVE_CONFIG_H" /D "HAVE_ZLIB" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ /c 
    86 # ADD BASE RSC /l 0x1409 /d "_DEBUG" 
    87 # ADD RSC /l 0x1409 /d "_DEBUG" 
    88 BSC32=bscmake.exe 
    89 # ADD BASE BSC32 /nologo 
    90 # ADD BSC32 /nologo 
    91 LINK32=link.exe 
    92 # 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 /dll /debug /machine:I386 /pdbtype:sept 
    93 # 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:windows /dll /debug /machine:I386 /pdbtype:sept 
    94 # Begin Custom Build - Performing registration 
    95 OutDir=.\DebugU 
    96 TargetPath=.\DebugU\SwishCtl.dll 
    97 InputPath=.\DebugU\SwishCtl.dll 
    98 SOURCE="$(InputPath)" 
    99  
    100 "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" 
    101         if "%OS%"=="" goto NOTNT  
    102         if not "%OS%"=="Windows_NT" goto NOTNT  
    103         regsvr32 /s /c "$(TargetPath)"  
    104         echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"  
    105         goto end  
    106         :NOTNT  
    107         echo Warning : Cannot register Unicode DLL on Windows 95  
    108         :end  
    10964         
    11065# End Custom Build 
    …… 
    12479# PROP Target_Dir "" 
    12580# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c 
    126 # ADD CPP /nologo /MT /W3 /GX /I "..\swish-e\src\Win32" /I "..\dev\swish-e\src" /D "HAVE_PCRE" /D "HAVE_CONFIG_H" /D "HAVE_ZLIB" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /Yu"stdafx.h" /FD /c 
     81# ADD CPP /nologo /MT /W3 /GX /I "..\..\swish-e\src" /I "..\dev\swish-e\src" /D "HAVE_CONFIG_H" /D "HAVE_ZLIB" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /Yu"stdafx.h" /FD /c 
    12782# ADD BASE RSC /l 0x1409 /d "NDEBUG" 
    12883# ADD RSC /l 0x1409 /d "NDEBUG" 
    …… 
    13287LINK32=link.exe 
    13388# 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 /dll /machine:I386 
    134 # 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 ../swish-e/src/win32/libswishsearch.lib ../pcre/lib/libpcre.lib ../zlib/zlib.lib /nologo /subsystem:windows /dll /machine:I386 
     89# 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 ../../swish-e/src/win32/libswishsearch.lib ../../zlib/zlib.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../SwishCtl.dll" 
    13590# SUBTRACT LINK32 /nodefaultlib 
    13691# Begin Custom Build - Performing registration 
    13792OutDir=.\ReleaseMinSize 
    138 TargetPath=.\ReleaseMinSize\SwishCtl.dll 
    139 InputPath=.\ReleaseMinSize\SwishCtl.dll 
     93TargetPath=\projects\swish\win32\swishctl\SwishCtl.dll 
     94InputPath=\projects\swish\win32\swishctl\SwishCtl.dll 
    14095SOURCE="$(InputPath)" 
    14196 
    …… 
    146101# End Custom Build 
    147102 
    148 !ELSEIF  "$(CFG)" == "SwishCtl - Win32 Release MinDependency" 
    149  
    150 # PROP BASE Use_MFC 0 
    151 # PROP BASE Use_Debug_Libraries 0 
    152 # PROP BASE Output_Dir "ReleaseMinDependency" 
    153 # PROP BASE Intermediate_Dir "ReleaseMinDependency" 
    154 # PROP BASE Target_Dir "" 
    155 # PROP Use_MFC 0 
    156 # PROP Use_Debug_Libraries 0 
    157 # PROP Output_Dir "ReleaseMinDependency" 
    158 # PROP Intermediate_Dir "ReleaseMinDependency" 
    159 # PROP Ignore_Export_Lib 0 
    160 # PROP Target_Dir "" 
    161 # ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c 
    162 # ADD CPP /nologo /MT /W3 /GX /O1 /I "..\dev\swish-e\src" /D "HAVE_PCRE" /D "HAVE_CONFIG_H" /D "HAVE_ZLIB" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /Yu"stdafx.h" /FD /c 
    163 # ADD BASE RSC /l 0x1409 /d "NDEBUG" 
    164 # ADD RSC /l 0x1409 /d "NDEBUG" 
    165 BSC32=bscmake.exe 
    166 # ADD BASE BSC32 /nologo 
    167 # ADD BSC32 /nologo 
    168 LINK32=link.exe 
    169 # 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 /dll /machine:I386 
    170 # 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 ../swish-e/src/win32/libswish-e.lib ../libxml2/win32/dsp/libxml2/libxml2.lib ../pcre/lib/libpcre.lib ../zlib/zlib.lib /nologo /subsystem:windows /dll /machine:I386 
    171 # SUBTRACT LINK32 /pdb:none 
    172 # Begin Custom Build - Performing registration 
    173 OutDir=.\ReleaseMinDependency 
    174 TargetPath=.\ReleaseMinDependency\SwishCtl.dll 
    175 InputPath=.\ReleaseMinDependency\SwishCtl.dll 
    176 SOURCE="$(InputPath)" 
    177  
    178 "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" 
    179         regsvr32 /s /c "$(TargetPath)"  
    180         echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"  
    181          
    182 # End Custom Build 
    183  
    184 !ELSEIF  "$(CFG)" == "SwishCtl - Win32 Unicode Release MinSize" 
    185  
    186 # PROP BASE Use_MFC 0 
    187 # PROP BASE Use_Debug_Libraries 0 
    188 # PROP BASE Output_Dir "ReleaseUMinSize" 
    189 # PROP BASE Intermediate_Dir "ReleaseUMinSize" 
    190 # PROP BASE Target_Dir "" 
    191 # PROP Use_MFC 0 
    192 # PROP Use_Debug_Libraries 0 
    193 # PROP Output_Dir "ReleaseUMinSize" 
    194 # PROP Intermediate_Dir "ReleaseUMinSize" 
    195 # PROP Ignore_Export_Lib 0 
    196 # PROP Target_Dir "" 
    197 # ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c 
    198 # ADD CPP /nologo /MT /W3 /O1 /I "F:\dev\swish-e\src\Win32" /I "F:\dev\swish-e\src" /D "HAVE_PCRE" /D "HAVE_CONFIG_H" /D "HAVE_ZLIB" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c 
    199 # ADD BASE RSC /l 0x1409 /d "NDEBUG" 
    200 # ADD RSC /l 0x1409 /d "NDEBUG" 
    201 BSC32=bscmake.exe 
    202 # ADD BASE BSC32 /nologo 
    203 # ADD BSC32 /nologo 
    204 LINK32=link.exe 
    205 # 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 /dll /machine:I386 
    206 # 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:windows /dll /machine:I386 
    207 # Begin Custom Build - Performing registration 
    208 OutDir=.\ReleaseUMinSize 
    209 TargetPath=.\ReleaseUMinSize\SwishCtl.dll 
    210 InputPath=.\ReleaseUMinSize\SwishCtl.dll 
    211 SOURCE="$(InputPath)" 
    212  
    213 "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" 
    214         if "%OS%"=="" goto NOTNT  
    215         if not "%OS%"=="Windows_NT" goto NOTNT  
    216         regsvr32 /s /c "$(TargetPath)"  
    217         echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"  
    218         goto end  
    219         :NOTNT  
    220         echo Warning : Cannot register Unicode DLL on Windows 95  
    221         :end  
    222          
    223 # End Custom Build 
    224  
    225 !ELSEIF  "$(CFG)" == "SwishCtl - Win32 Unicode Release MinDependency" 
    226  
    227 # PROP BASE Use_MFC 0 
    228 # PROP BASE Use_Debug_Libraries 0 
    229 # PROP BASE Output_Dir "ReleaseUMinDependency" 
    230 # PROP BASE Intermediate_Dir "ReleaseUMinDependency" 
    231 # PROP BASE Target_Dir "" 
    232 # PROP Use_MFC 0 
    233 # PROP Use_Debug_Libraries 0 
    234 # PROP Output_Dir "ReleaseUMinDependency" 
    235 # PROP Intermediate_Dir "ReleaseUMinDependency" 
    236 # PROP Target_Dir "" 
    237 # ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c 
    238 # ADD CPP /nologo /MT /W3 /O1 /I "F:\dev\swish-e\src\Win32" /I "F:\dev\swish-e\src" /D "HAVE_PCRE" /D "HAVE_CONFIG_H" /D "HAVE_ZLIB" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c 
    239 # ADD BASE RSC /l 0x1409 /d "NDEBUG" 
    240 # ADD RSC /l 0x1409 /d "NDEBUG" 
    241 BSC32=bscmake.exe 
    242 # ADD BASE BSC32 /nologo 
    243 # ADD BSC32 /nologo 
    244 LINK32=link.exe 
    245 # 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 /dll /machine:I386 
    246 # 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:windows /dll /machine:I386 
    247 # Begin Custom Build - Performing registration 
    248 OutDir=.\ReleaseUMinDependency 
    249 TargetPath=.\ReleaseUMinDependency\SwishCtl.dll 
    250 InputPath=.\ReleaseUMinDependency\SwishCtl.dll 
    251 SOURCE="$(InputPath)" 
    252  
    253 "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" 
    254         if "%OS%"=="" goto NOTNT  
    255         if not "%OS%"=="Windows_NT" goto NOTNT  
    256         regsvr32 /s /c "$(TargetPath)"  
    257         echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"  
    258         goto end  
    259         :NOTNT  
    260         echo Warning : Cannot register Unicode DLL on Windows 95  
    261         :end  
    262          
    263 # End Custom Build 
    264  
    265103!ENDIF  
    266104 
    …… 
    268106 
    269107# Name "SwishCtl - Win32 Debug" 
    270 # Name "SwishCtl - Win32 Unicode Debug" 
    271108# Name "SwishCtl - Win32 Release MinSize" 
    272 # Name "SwishCtl - Win32 Release MinDependency" 
    273 # Name "SwishCtl - Win32 Unicode Release MinSize" 
    274 # Name "SwishCtl - Win32 Unicode Release MinDependency" 
    275109# Begin Group "Source Files" 
    276110