X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/302aa842e96914fb11dd86972c3e6d79f35bc44d..a5a0dd06b67fecd5e571bd9d4221101393d5561b:/utils/projgen/makeproj.cpp diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp index 39b92e2901..1963b4294f 100644 --- a/utils/projgen/makeproj.cpp +++ b/utils/projgen/makeproj.cpp @@ -54,7 +54,7 @@ public: virtual bool OnInit(); bool GenerateSample(const wxString& projectName, const wxString& targetName, - const wxString& path, const wxStringList& sourceFiles); + const wxString& path, const wxStringList& sourceFiles, const wxString& relativeRootPath = "../.."); void GenerateSamples(const wxString& dir); // Takes wxWindows directory path }; @@ -71,7 +71,7 @@ public: void OnGenerate(wxCommandEvent& event); bool GenerateSample(const wxString& projectName, const wxString& targetName, - const wxString& path, const wxStringList& sourceFiles); + const wxString& path, const wxStringList& sourceFiles, const wxString& relativeRootPath = "../.."); private: // any class wishing to process wxWindows events must use this macro @@ -162,16 +162,25 @@ bool MyApp::OnInit() } bool MyApp::GenerateSample(const wxString& projectName, const wxString& targetName, - const wxString& path, const wxStringList& sourceFiles) + const wxString& path, const wxStringList& sourceFiles, const wxString& relativeRootPath) { + wxString relativeIncludePath(relativeRootPath + wxString("/include")); + wxString relativeLibPath(relativeRootPath + wxString("/lib")); + wxString relativeDebugPath(relativeRootPath + wxString("/src/Debug")); + 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; // For all samples - project.SetIncludeDirs(wxStringList("../../include", 0)); - project.SetResourceIncludeDirs(wxStringList("../../include", 0)); - project.SetLibDirs(wxStringList("../../lib", 0)); - project.SetDebugLibDirs(wxStringList("../../src/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../src/Release", 0)); + 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, (const char*) relativeDebugPathTIFF, 0)); + project.SetReleaseLibDirs(wxStringList((const char*) relativeReleasePath, (const char*) relativeReleasePathJPEG, (const char*) relativeReleasePathTIFF, 0)); project.SetProjectName(projectName); project.SetTargetName(targetName); @@ -194,8 +203,9 @@ void MyApp::GenerateSamples(const wxString& dir) // Small bug. Because we don't distinguish between Debug/DebugDLL, Release/ReleaseDLL, // we can't yet make a sample that uses other wxWindows static libraries + the wxWindows DLL library. - GenerateSample("BombsVC", "bombs", dir + wxString("/samples/bombs"), - wxStringList("bombs.cpp", "bombs1.cpp", "game.cpp", "bombs.h", "game.h", 0)); + //// Samples + + GenerateSample("CalendarVC", "calendar", dir + wxString("/samples/calendar"), wxStringList("calendar.cpp", 0)); GenerateSample("CaretVC", "caret", dir + wxString("/samples/caret"), wxStringList("caret.cpp", 0)); GenerateSample("CheckLstVC", "checklst", dir + wxString("/samples/checklst"), wxStringList("checklst.cpp", 0)); GenerateSample("ConfigVC", "conftest", dir + wxString("/samples/config"), wxStringList("conftest.cpp", 0)); @@ -210,22 +220,29 @@ void MyApp::GenerateSamples(const wxString& dir) GenerateSample("DocVwMDIVC", "docview", dir + wxString("/samples/docvwmdi"), wxStringList("docview.cpp", "doc.cpp", "view.cpp", "docview.h", "doc.h", "view.h", 0)); GenerateSample("DynamicVC", "dynamic", dir + wxString("/samples/dynamic"), wxStringList("dynamic.cpp", 0)); - GenerateSample("FortyVC", "forty", dir + wxString("/samples/forty"), - wxStringList("forty.cpp", "canvas.cpp", "card.cpp", "game.cpp", "pile.cpp", "playerdg.cpp", "scoredg.cpp", "scorefil.cpp", - "canvas.h", "forty.h", "card.h", "game.h", "pile.h", "playerdg.h", "scoredg.h", "scorefil.h", - 0)); - GenerateSample("FractalVC", "fractal", dir + wxString("/samples/fractal"), wxStringList("fractal.cpp", 0)); + GenerateSample("DrawingVC", "drawing", dir + wxString("/samples/drawing"), wxStringList("drawing.cpp", 0)); + GenerateSample("ExecVC", "exec", dir + wxString("/samples/exec"), wxStringList("exec.cpp", 0)); GenerateSample("GridVC", "test", dir + wxString("/samples/grid"), wxStringList("test.cpp", 0)); + GenerateSample("NewGridVC", "griddemo", dir + wxString("/samples/newgrid"), wxStringList("griddemo.cpp", 0)); GenerateSample("HelpVC", "demo", dir + wxString("/samples/help"), wxStringList("demo.cpp", 0)); // wxHTML samples - GenerateSample("AboutVC", "about", dir + wxString("/samples/html/about"), wxStringList("about.cpp", 0)); - GenerateSample("HelpVC", "help", dir + wxString("/samples/html/help"), wxStringList("help.cpp", 0)); - GenerateSample("PrintingVC", "printing", dir + wxString("/samples/html/printing"), wxStringList("printing.cpp", 0)); - GenerateSample("TestVC", "test", dir + wxString("/samples/html/test"), wxStringList("test.cpp", 0)); - GenerateSample("VirtualVC", "virtual", dir + wxString("/samples/html/virtual"), wxStringList("virtual.cpp", 0)); - GenerateSample("WidgetVC", "widget", dir + wxString("/samples/html/widget"), wxStringList("widget.cpp", 0)); - GenerateSample("ZipVC", "zip", dir + wxString("/samples/html/zip"), wxStringList("zip.cpp", 0)); + GenerateSample("AboutVC", "about", dir + wxString("/samples/html/about"), wxStringList("about.cpp", 0), + "../../.."); + GenerateSample("HelpVC", "help", dir + wxString("/samples/html/help"), wxStringList("help.cpp", 0), + "../../.."); + GenerateSample("PrintingVC", "printing", dir + wxString("/samples/html/printing"), wxStringList("printing.cpp", 0), + "../../.."); + GenerateSample("TestVC", "test", dir + wxString("/samples/html/test"), wxStringList("test.cpp", 0), + "../../.."); + GenerateSample("VirtualVC", "virtual", dir + wxString("/samples/html/virtual"), wxStringList("virtual.cpp", 0), + "../../.."); + GenerateSample("WidgetVC", "widget", dir + wxString("/samples/html/widget"), wxStringList("widget.cpp", 0), + "../../.."); + GenerateSample("ZipVC", "zip", dir + wxString("/samples/html/zip"), wxStringList("zip.cpp", 0), + "../../.."); + GenerateSample("HelpViewVC", "helpview", dir + wxString("/samples/html/helpview"), wxStringList("helpview.cpp", 0), + "../../.."); GenerateSample("ImageVC", "image", dir + wxString("/samples/image"), wxStringList("image.cpp", 0)); GenerateSample("InternatVC", "internat", dir + wxString("/samples/internat"), wxStringList("internat.cpp", 0)); @@ -239,36 +256,65 @@ void MyApp::GenerateSamples(const wxString& dir) GenerateSample("MiniframVC", "test", dir + wxString("/samples/minifram"), wxStringList("test.cpp", "test.h", 0)); GenerateSample("MinimalVC", "minimal", dir + wxString("/samples/minimal"), wxStringList("minimal.cpp", 0)); GenerateSample("NativdlgVC", "nativdlg", dir + wxString("/samples/nativdlg"), wxStringList("nativdlg.cpp", "nativdlg.h", "resource.h", 0)); - GenerateSample("NettestVC", "nettest", dir + wxString("/samples/nettest"), wxStringList("nettest.cpp", 0)); + GenerateSample("DialupVC", "nettest", dir + wxString("/samples/dialup"), wxStringList("nettest.cpp", 0)); GenerateSample("NotebookVC", "test", dir + wxString("/samples/notebook"), wxStringList("test.cpp", "test.h", 0)); GenerateSample("OleautoVC", "oleauto", dir + wxString("/samples/oleauto"), wxStringList("oleauto.cpp", 0)); GenerateSample("OwnerdrwVC", "ownerdrw", dir + wxString("/samples/ownerdrw"), wxStringList("ownerdrw.cpp", 0)); GenerateSample("PngVC", "pngdemo", dir + wxString("/samples/png"), wxStringList("pngdemo.cpp", "pngdemo.h", 0)); GenerateSample("PrintingVC", "printing", dir + wxString("/samples/printing"), wxStringList("printing.cpp", "printing.h", 0)); GenerateSample("ProplistVC", "test", dir + wxString("/samples/proplist"), wxStringList("test.cpp", "test.h", 0)); + GenerateSample("PropsizeVC", "propsize", dir + wxString("/samples/propsize"), wxStringList("propsize.cpp", 0)); GenerateSample("RegtestVC", "regtest", dir + wxString("/samples/regtest"), wxStringList("regtest.cpp", 0)); GenerateSample("ResourceVC", "resource", dir + wxString("/samples/resource"), wxStringList("resource.cpp", "resource.h", 0)); GenerateSample("RichEditVC", "wxLayout", dir + wxString("/samples/richedit"), wxStringList("wxLayout.cpp", "kbList.cpp", "wxllist.cpp", "wxlparser.cpp", "wxlwindow.cpp", 0)); GenerateSample("SashtestVC", "sashtest", dir + wxString("/samples/sashtest"), wxStringList("sashtest.cpp", "sashtest.h", 0)); GenerateSample("ScrollVC", "scroll", dir + wxString("/samples/scroll"), wxStringList("scroll.cpp", 0)); + GenerateSample("ScrollsubVC", "scrollsub", dir + wxString("/samples/scrollsub"), wxStringList("scrollsub.cpp", 0)); GenerateSample("SplitterVC", "test", dir + wxString("/samples/splitter"), wxStringList("test.cpp", 0)); GenerateSample("TabVC", "test", dir + wxString("/samples/tab"), wxStringList("test.cpp", "test.h", 0)); GenerateSample("TaskbarVC", "tbtest", dir + wxString("/samples/taskbar"), wxStringList("tbtest.cpp", "tbtest.h", 0)); GenerateSample("TextVC", "text", dir + wxString("/samples/text"), wxStringList("text.cpp", 0)); GenerateSample("ThreadVC", "test", dir + wxString("/samples/thread"), wxStringList("test.cpp", 0)); - GenerateSample("ToolbarVC", "test", dir + wxString("/samples/toolbar"), wxStringList("test.cpp", "test.h", 0)); + GenerateSample("ToolbarVC", "toolbar", dir + wxString("/samples/toolbar"), wxStringList("toolbar.cpp", 0)); GenerateSample("TreectrlVC", "treetest", dir + wxString("/samples/treectrl"), wxStringList("treetest.cpp", "treetest.h", 0)); GenerateSample("TypetestVC", "typetest", dir + wxString("/samples/typetest"), wxStringList("typetest.cpp", "typetest.h", 0)); GenerateSample("ValidateVC", "validate", dir + wxString("/samples/validate"), wxStringList("validate.cpp", "validate.h", 0)); - GenerateSample("ClientVC", "client", dir + wxString("/samples/wxsocket"), wxStringList("client.cpp", 0)); - GenerateSample("ServerVC", "server", dir + wxString("/samples/wxsocket"), wxStringList("server.cpp", 0)); - GenerateSample("PoemVC", "wxpoem", dir + wxString("/samples/wxpoem"), wxStringList("wxpoem.cpp", "wxpoem.h", 0)); - GenerateSample("ClientVC", "client", dir + wxString("/samples/dde"), wxStringList("client.cpp", "client.h", "ddesetup.h", 0)); - GenerateSample("ServerVC", "server", dir + wxString("/samples/dde"), wxStringList("server.cpp", "server.h", "ddesetup.h", 0)); + GenerateSample("ClientVC", "client", dir + wxString("/samples/sockets"), wxStringList("client.cpp", 0)); + GenerateSample("ServerVC", "server", dir + wxString("/samples/sockets"), wxStringList("server.cpp", 0)); + GenerateSample("ClientVC", "client", dir + wxString("/samples/ipc"), wxStringList("client.cpp", "client.h", "ddesetup.h", 0)); + GenerateSample("ServerVC", "server", dir + wxString("/samples/ipc"), wxStringList("server.cpp", "server.h", "ddesetup.h", 0)); GenerateSample("CaretVC", "caret", dir + wxString("/samples/caret"), wxStringList("caret.cpp", 0)); GenerateSample("DrawingVC", "drawing", dir + wxString("/samples/drawing"), wxStringList("drawing.cpp", 0)); GenerateSample("ScrollVC", "scroll", dir + wxString("/samples/scroll"), wxStringList("scroll.cpp", 0)); + GenerateSample("WizardVC", "wizard", dir + wxString("/samples/wizard"), wxStringList("wiztest.cpp", 0)); + GenerateSample("RotateVC", "rotate", dir + wxString("/samples/rotate"), wxStringList("rotate.cpp", 0)); + GenerateSample("ExecVC", "exec", dir + wxString("/samples/exec"), wxStringList("exec.cpp", 0)); + GenerateSample("FontVC", "font", dir + wxString("/samples/font"), wxStringList("font.cpp", 0)); + GenerateSample("MenuVC", "menu", dir + wxString("/samples/menu"), wxStringList("menu.cpp", 0)); + + //// Demos + + GenerateSample("BombsVC", "bombs", dir + wxString("/demos/bombs"), + wxStringList("bombs.cpp", "bombs1.cpp", "game.cpp", "bombs.h", "game.h", 0)); + + GenerateSample("FortyVC", "forty", dir + wxString("/demos/forty"), + wxStringList("forty.cpp", "canvas.cpp", "card.cpp", "game.cpp", "pile.cpp", "playerdg.cpp", "scoredg.cpp", "scorefil.cpp", + "canvas.h", "forty.h", "card.h", "game.h", "pile.h", "playerdg.h", "scoredg.h", "scorefil.h", + 0)); + + GenerateSample("FractalVC", "fractal", dir + wxString("/demos/fractal"), wxStringList("fractal.cpp", 0)); + + GenerateSample("LifeVC", "life", dir + wxString("/demos/life"), + wxStringList("life.cpp", "game.cpp", "dialogs.cpp", "life.h", "game.h", "dialogs.h", 0)); + + GenerateSample("PoemVC", "wxpoem", dir + wxString("/demos/poem"), wxStringList("wxpoem.cpp", "wxpoem.h", 0)); + + GenerateSample("DbbrowseVC", "dbbrowse", dir + wxString("/demos/dbbrowse"), + wxStringList("dbbrowse.cpp", "browsedb.cpp", "dbgrid.cpp", "dbtree.cpp", "dlguser.cpp", "doc.cpp", + "pgmctrl.cpp", "tabpgwin.cpp", + "dbbrowse.h", "browsedb.h", "dbgrid.h", "dbtree.h", "dlguser.h", "doc.h", "pgmctrl.h", "std.h", "tabpgwin.h", + 0)); //// Utilities @@ -278,8 +324,8 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetIncludeDirs(wxStringList("../../../include", 0)); project.SetResourceIncludeDirs(wxStringList("../../../include", 0)); project.SetLibDirs(wxStringList("../../../lib", 0)); - project.SetDebugLibDirs(wxStringList("../../../src/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../src/Release", 0)); + project.SetDebugLibDirs(wxStringList("../../../src/Debug", "../../../src/jpeg/Debug", "../../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../../src/Release", "../../../src/jpeg/Release", "../../../src/tiff/Release", 0)); project.SetProjectName("DialogEdVC"); project.SetTargetName("dialoged"); @@ -300,8 +346,8 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetIncludeDirs(wxStringList("../../../include", 0)); project.SetResourceIncludeDirs(wxStringList("../../../include", 0)); project.SetLibDirs(wxStringList("../../../lib", 0)); - project.SetDebugLibDirs(wxStringList("../../../src/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../src/Release", 0)); + project.SetDebugLibDirs(wxStringList("../../../src/Debug", "../../../src/jpeg/Debug", "../../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../../src/Release", "../../../src/jpeg/Release", "../../../src/tiff/Release", 0)); project.SetProjectName("Tex2RTFVC"); project.SetTargetName("tex2rtf"); @@ -317,12 +363,12 @@ void MyApp::GenerateSamples(const wxString& dir) wxMessageBox(msg); } - // Tex2RTF + // HelpGen project.SetIncludeDirs(wxStringList("../../../include", 0)); project.SetResourceIncludeDirs(wxStringList("../../../include", 0)); project.SetLibDirs(wxStringList("../../../lib", 0)); - project.SetDebugLibDirs(wxStringList("../../../src/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../src/Release", 0)); + project.SetDebugLibDirs(wxStringList("../../../src/Debug", "../../../src/jpeg/Debug", "../../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../../src/Release", "../../../src/jpeg/Release", "../../../src/tiff/Release", 0)); project.SetProjectName("HelpGenVC"); project.SetTargetName("helpgen"); @@ -339,13 +385,49 @@ void MyApp::GenerateSamples(const wxString& dir) wxMessageBox(msg); } + // ProjGen + project.SetIncludeDirs(wxStringList("../../include", 0)); + project.SetResourceIncludeDirs(wxStringList("../../include", 0)); + project.SetLibDirs(wxStringList("../../lib", 0)); + project.SetDebugLibDirs(wxStringList("../../src/Debug", "../../src/jpeg/Debug", "../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../src/Release", "../../src/jpeg/Release", "../../src/tiff/Release", 0)); + + project.SetProjectName("ProjGenVC"); + project.SetTargetName("makeproj"); + project.SetProjectPath(dir + wxString("/utils/projgen")); + project.SetSourceFiles(wxStringList("makeproj.cpp", "makeproj.h", 0)); + + if (!project.GenerateVCProject()) + { + wxString msg("Could not generate ProjGen project"); + wxMessageBox(msg); + } + + // hhp2cached + project.SetIncludeDirs(wxStringList("../../include", 0)); + project.SetResourceIncludeDirs(wxStringList("../../include", 0)); + project.SetLibDirs(wxStringList("../../lib", 0)); + project.SetDebugLibDirs(wxStringList("../../src/Debug", "../../src/jpeg/Debug", "../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../src/Release", "../../src/jpeg/Release", "../../src/tiff/Release", 0)); + + project.SetProjectName("hhp2cachedVC"); + project.SetTargetName("hhp2cached"); + project.SetProjectPath(dir + wxString("/utils/hhp2cached")); + project.SetSourceFiles(wxStringList("hhp2cached.cpp", 0)); + + if (!project.GenerateVCProject()) + { + wxString msg("Could not generate hhp2cached project"); + wxMessageBox(msg); + } + // wxTreeLayout sample project.SetIncludeDirs(wxStringList("../../../include", 0)); project.SetResourceIncludeDirs(wxStringList("../../../include", 0)); project.SetLibDirs(wxStringList("../../../lib", 0)); - project.SetDebugLibDirs(wxStringList("../../../src/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../src/Release", 0)); + project.SetDebugLibDirs(wxStringList("../../../src/Debug", "../../../src/jpeg/Debug", "../../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../../src/Release", "../../../src/jpeg/Release", "../../../src/tiff/Release", 0)); project.SetProjectName("TreeSampleVC"); project.SetTargetName("test"); @@ -363,8 +445,9 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetIncludeDirs(wxStringList("../../../../include", "../../src", 0)); project.SetResourceIncludeDirs(wxStringList("../../../../include", 0)); project.SetLibDirs(wxStringList("../../../../lib", 0)); - project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../src/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../src/Release", 0)); + project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../src/Debug", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../src/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0)); + project.SetExtraLibs(wxStringList("ogl.lib", 0)); project.SetProjectName("OGLEditVC"); @@ -385,8 +468,8 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetIncludeDirs(wxStringList("../../../../include", "../../src", 0)); project.SetResourceIncludeDirs(wxStringList("../../../../include", 0)); project.SetLibDirs(wxStringList("../../../../lib", 0)); - project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../src/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../src/Release", 0)); + project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../src/Debug", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../src/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0)); project.SetExtraLibs(wxStringList("ogl.lib", 0)); project.SetProjectName("StudioVC"); @@ -409,8 +492,9 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetIncludeDirs(wxStringList("../../../../include", "../../win", 0)); project.SetResourceIncludeDirs(wxStringList("../../../../include", 0)); project.SetLibDirs(wxStringList("../../../../lib", 0)); - project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../win/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", 0)); + project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../win/Debug", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0)); + project.SetExtraLibs(wxStringList("glcanvas.lib", "opengl32.lib", "glu32.lib", 0)); project.SetProjectName("CubeVC"); @@ -430,8 +514,8 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetIncludeDirs(wxStringList("../../../../include", "../../win", 0)); project.SetResourceIncludeDirs(wxStringList("../../../../include", 0)); project.SetLibDirs(wxStringList("../../../../lib", 0)); - project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../win/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", 0)); + project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../win/Debug", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0)); project.SetExtraLibs(wxStringList("glcanvas.lib", "opengl32.lib", "glu32.lib", 0)); project.SetProjectName("IsoSurfVC"); @@ -451,8 +535,8 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetIncludeDirs(wxStringList("../../../../include", "../../win", 0)); project.SetResourceIncludeDirs(wxStringList("../../../../include", 0)); project.SetLibDirs(wxStringList("../../../../lib", 0)); - project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../win/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", 0)); + project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../win/Debug", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0)); project.SetExtraLibs(wxStringList("glcanvas.lib", "opengl32.lib", "glu32.lib", 0)); project.SetProjectName("PenguinVC"); @@ -522,9 +606,9 @@ void MyFrame::OnGenerate(wxCommandEvent& WXUNUSED(event)) } bool MyFrame::GenerateSample(const wxString& projectName, const wxString& targetName, - const wxString& path, const wxStringList& sourceFiles) + const wxString& path, const wxStringList& sourceFiles, const wxString& relativeRootPath) { - return wxGetApp().GenerateSample(projectName, targetName, path, sourceFiles); + return wxGetApp().GenerateSample(projectName, targetName, path, sourceFiles, relativeRootPath); } /* @@ -618,8 +702,8 @@ bool wxProject::GenerateVCProject() stream << "# ADD BASE BSC32 /nologo\n"; 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 /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 wxvc.lib "; + 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 tiff.lib "; n = m_extraLibs.Number(); for (i = 0; i < n; i++) { @@ -627,7 +711,7 @@ bool wxProject::GenerateVCProject() stream << lib << " "; } - stream << "/nologo /subsystem:windows /machine:I386 /nodefaultlib:\"libc.lib\" /nodefaultlib:\"libci.lib\" /out:\"Release/" << m_targetName << ".exe\""; + stream << "/nologo /subsystem:windows /machine:I386 /nodefaultlib:\"libc.lib,libci.lib,msvcrtd.lib\" /out:\"Release/" << m_targetName << ".exe\""; n = m_releaseLibDirs.Number(); for (i = 0; i < n; i++) @@ -660,7 +744,7 @@ bool wxProject::GenerateVCProject() stream << "# PROP Ignore_Export_Lib 0\n"; stream << "# PROP Target_Dir \"\"\n"; stream << "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D \"WIN32\" /D \"_DEBUG\" /D \"_WINDOWS\" /YX /FD /c\n"; - stream << "# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /Od"; + stream << "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; n = m_includeDirs.Number(); for (i = 0; i < n; i++) @@ -678,15 +762,15 @@ bool wxProject::GenerateVCProject() stream << "# ADD BASE BSC32 /nologo\n"; 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 /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 wxvc.lib "; + 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 tiff.lib "; n = m_extraLibs.Number(); for (i = 0; i < n; i++) { wxString lib = m_extraLibs[i]; stream << lib << " "; } - stream << "/nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:\"libcd.lib\" /nodefaultlib:\"libcid.lib\" /out:\"Debug/" << m_targetName << ".exe\" /pdbtype:sept"; + stream << "/nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:\"libcd.lib,libcid.lib,msvcrt.lib\" /out:\"Debug/" << m_targetName << ".exe\" /pdbtype:sept"; n = m_debugLibDirs.Number(); for (i = 0; i < n; i++) @@ -721,7 +805,7 @@ bool wxProject::GenerateVCProject() stream << "# PROP Ignore_Export_Lib 0\n"; stream << "# PROP Target_Dir \"\"\n"; stream << "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D \"WIN32\" /D \"_DEBUG\" /D \"_WINDOWS\" /YX /FD /c\n"; - stream << "# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /Od"; + stream << "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; n = m_includeDirs.Number(); for (i = 0; i < n; i++) @@ -739,8 +823,8 @@ bool wxProject::GenerateVCProject() stream << "# ADD BASE BSC32 /nologo\n"; 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 /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 wxvc.lib "; + 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 "; n = m_extraLibs.Number(); for (i = 0; i < n; i++) { @@ -802,8 +886,8 @@ bool wxProject::GenerateVCProject() stream << "# ADD BASE BSC32 /nologo\n"; 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 /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 wxvc.lib "; + 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 "; n = m_extraLibs.Number(); for (i = 0; i < n; i++) {