Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed references to separate prop and porting docs. Added imagtiff.cpp

Browse Source 
to VC++ project files. Added tiff library to makeproj.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-12-28 13:57:57 +00:00
parent 52ca3f113e
commit 1a3aa77fc7
7 changed files with 24 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/projgen/makeproj.cpp
View File

@@ -170,6 +170,8 @@ bool MyApp::GenerateSample(const wxString& projectName, const wxString& targetNa
wxString relativeReleasePath(relativeRootPath + wxString("/src/Release"));
wxString relativeDebugPathJPEG(relativeRootPath + wxString("/src/jpeg/Debug"));
wxString relativeReleasePathJPEG(relativeRootPath + wxString("/src/jpeg/Release"));
wxString relativeDebugPathTIFF(relativeRootPath + wxString("/src/tiff/Debug"));
wxString relativeReleasePathTIFF(relativeRootPath + wxString("/src/tiff/Release"));
wxProject project;
@@ -177,8 +179,8 @@ bool MyApp::GenerateSample(const wxString& projectName, const wxString& targetNa
project.SetIncludeDirs(wxStringList((const char*) relativeIncludePath, 0));
project.SetResourceIncludeDirs(wxStringList((const char*) relativeIncludePath, 0));
project.SetLibDirs(wxStringList((const char*) relativeLibPath, 0));
project.SetDebugLibDirs(wxStringList((const char*) relativeDebugPath, (const char*) relativeDebugPathJPEG, 0));
project.SetReleaseLibDirs(wxStringList((const char*) relativeReleasePath, (const char*) relativeReleasePathJPEG, 0));
project.SetDebugLibDirs(wxStringList((const char*) relativeDebugPath, (const char*) relativeDebugPathJPEG, (const char*) relativeDebugPathTIFF, 0));
project.SetReleaseLibDirs(wxStringList((const char*) relativeReleasePath, (const char*) relativeReleasePathJPEG, (const char*) relativeReleasePathTIFF, 0));
project.SetProjectName(projectName);
project.SetTargetName(targetName);
@@ -656,7 +658,7 @@ bool wxProject::GenerateVCProject()
stream << "# ADD BSC32 /nologo\n";
stream << "LINK32=link.exe\n";
stream << "# 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 wsock32.lib /nologo /subsystem:windows /machine:I386\n";
stream << "# 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 comctl32.lib rpcrt4.lib wsock32.lib wxvc.lib jpeg.lib ";
stream << "# 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 comctl32.lib rpcrt4.lib wsock32.lib wxvc.lib jpeg.lib tiff.lib ";
n = m_extraLibs.Number();
for (i = 0; i < n; i++)
{
@@ -716,7 +718,7 @@ bool wxProject::GenerateVCProject()
stream << "# ADD BSC32 /nologo\n";
stream << "LINK32=link.exe\n";
stream << "# 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 wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\n";
stream << "# 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 comctl32.lib rpcrt4.lib wsock32.lib wxvc.lib jpeg.lib ";
stream << "# 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 comctl32.lib rpcrt4.lib wsock32.lib wxvc.lib jpeg.lib tiff.lib ";
n = m_extraLibs.Number();
for (i = 0; i < n; i++)
{