bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed MSVC 6 build.

Browse Source
This commit is contained in:
Ianos Gnatiuc 2007-01-11 19:12:35 +00:00
parent 52e08f890e
commit c58810fefe
5 changed files with 17 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
golded.dsw
View File

@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
###############################################################################
Project: "BuildAll"=.\windows\BuildAll.dsp - Package Owner=<4>
Project: "BuildAll"=".\windows\BuildAll.dsp" - Package Owner=<4>
Package=<5>
{{{
@ -20,14 +20,11 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name rddt
End Project Dependency
Begin Project Dependency
Project_Dep_Name goldlib
End Project Dependency
}}}
###############################################################################
Project: "golded"=.\windows\golded.dsp - Package Owner=<4>
Project: "golded"=".\windows\golded.dsp" - Package Owner=<4>
Package=<5>
{{{
@ -42,7 +39,7 @@ Package=<4>
###############################################################################
Project: "goldlib"=.\WINDOWS\goldlib.dsp - Package Owner=<4>
Project: "goldlib"=".\WINDOWS\goldlib.dsp" - Package Owner=<4>
Package=<5>
{{{
@ -54,7 +51,7 @@ Package=<4>
###############################################################################
Project: "goldnode"=.\windows\goldnode.dsp - Package Owner=<4>
Project: "goldnode"=".\windows\goldnode.dsp" - Package Owner=<4>
Package=<5>
{{{
@ -72,7 +69,7 @@ Package=<4>
###############################################################################
Project: "rddt"=.\windows\rddt.dsp - Package Owner=<4>
Project: "rddt"=".\windows\rddt.dsp" - Package Owner=<4>
Package=<5>
{{{

2
golded3/gefile.cpp
View File

@ -930,7 +930,7 @@ void FileRequest(GMsg* msg)
// Sort list if requested
if (CFG->frqoptions & FREQ_SORT)
{
sort(freqfile.begin(), freqfile.end(), FreqCmp);
std::sort(freqfile.begin(), freqfile.end(), FreqCmp);
}
// Run the picker

4
golded3/geread2.cpp
View File

@ -773,8 +773,8 @@ void ReadPeekURLs(GMsg* msg)
}
// Sort list if requested
if(CFG->peekurloptions & FREQ_SORT)
sort(Listi.begin(), Listi.end(), PeekURLCmp);
if (CFG->peekurloptions & FREQ_SORT)
std::sort(Listi.begin(), Listi.end(), PeekURLCmp);
// Run the picker
size_t n = MinV(urls.size(), (MAXROW-10));

3
goldlib/gall/gwinpckf.cpp
View File

@ -187,8 +187,7 @@ bool wpickfile(int srow, int scol, int erow, int ecol, int btype, vattr bordattr
}
// sort files in array by swapping their pointers
sort(strarr.begin( ), strarr.end( ), compare);
//std::qsort(p, files, sizeof(char*), (StdCmpCP)compare);
std::sort(strarr.begin(), strarr.end(), compare);
// let user pick file
if (strarr.size())

41
windows/BuildAll.dsp
View File

@ -2,7 +2,7 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (x86) Generic Project" 0x010a
CFG=BuildAll - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@ -17,66 +17,41 @@ CFG=BuildAll - Win32 Debug
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "BuildAll - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "BuildAll - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "BuildAll - Win32 Release" (based on "Win32 (x86) Generic Project")
!MESSAGE "BuildAll - Win32 Debug" (based on "Win32 (x86) Generic Project")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
MTL=midl.exe
!IF "$(CFG)" == "BuildAll - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "BuildAll___Win32_Release"
# PROP BASE Intermediate_Dir "BuildAll___Win32_Release"
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "bin\release\win32"
# PROP Intermediate_Dir "obj\release\win32"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /Gm /Gi- /GX /Zi /O1 /Ob1 /FD /c
# SUBTRACT CPP /Gy /YX
# ADD BASE RSC /l 0x419 /d "NDEBUG"
# ADD RSC /l 0x419 /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 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 /nologo /subsystem:console /pdb:none /machine:I386
!ELSEIF "$(CFG)" == "BuildAll - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "BuildAll___Win32_Debug"
# PROP BASE Intermediate_Dir "BuildAll___Win32_Debug"
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "bin\debug\win32"
# PROP Intermediate_Dir "obj\debug\win32"
# 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 /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x419 /d "_DEBUG"
# ADD RSC /l 0x419 /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 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 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
!ENDIF