X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d47ebd1e0567a5d4fd60f23eed0439db778fb328..b4e87ec32c0870a8dfa377199b2616d8eac9647a:/utils/projgen/makeproj.cpp diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp index 4b7fcda40f..88f2c6fa30 100644 --- a/utils/projgen/makeproj.cpp +++ b/utils/projgen/makeproj.cpp @@ -158,6 +158,8 @@ bool MyApp::OnInit() MyDialog* dialog = new MyDialog("VC++ MakeProject"); dialog->ShowModal(); + delete dialog; + return FALSE; } @@ -181,6 +183,7 @@ bool MyApp::GenerateSample(const wxString& projectName, const wxString& targetNa 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.SetExtraLibs(wxStringList("opengl32.lib", "glu32.lib", 0)); project.SetProjectName(projectName); project.SetTargetName(targetName); @@ -221,10 +224,19 @@ void MyApp::GenerateSamples(const wxString& dir) 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("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)); + // OpenGL samples + GenerateSample("CubeVC", "cube", dir + wxString("/samples/opengl/cube"), wxStringList("cube.cpp", "cube.h", 0), + "../../.."); + GenerateSample("IsosurfVC", "isosurf", dir + wxString("/samples/opengl/isosurf"), wxStringList("isosurf.cpp", "isousrf.h", 0), + "../../.."); + GenerateSample("PenguinVC", "penguin", dir + wxString("/samples/opengl/penguin"), wxStringList("penguin.cpp", "penguin.h", + "lw.cpp", "lw.h", "trackball.c", "trackball.h", 0), "../../.."); + // wxHTML samples GenerateSample("AboutVC", "about", dir + wxString("/samples/html/about"), wxStringList("about.cpp", 0), "../../.."); @@ -262,29 +274,37 @@ void MyApp::GenerateSamples(const wxString& dir) 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/socket"), wxStringList("client.cpp", 0)); - GenerateSample("ServerVC", "server", dir + wxString("/samples/socket"), wxStringList("server.cpp", 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("WizardVC", "wiztest", 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)); + GenerateSample("TreelayVC", "test", dir + wxString("/samples/treelay"), wxStringList("test.cpp", "test.h", 0)); + GenerateSample("DragimagVC", "test", dir + wxString("/samples/dragimag"), wxStringList("test.cpp", "test.h", 0)); //// Demos @@ -303,6 +323,12 @@ void MyApp::GenerateSamples(const wxString& dir) 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 // Dialog Editor @@ -311,8 +337,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"); @@ -333,8 +359,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"); @@ -354,8 +380,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("HelpGenVC"); project.SetTargetName("helpgen"); @@ -376,8 +402,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("ProjGenVC"); project.SetTargetName("makeproj"); @@ -390,37 +416,37 @@ void MyApp::GenerateSamples(const wxString& dir) 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)); + // 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("TreeSampleVC"); - project.SetTargetName("test"); - project.SetProjectPath(dir + wxString("/utils/wxtree/src")); - project.SetSourceFiles(wxStringList("test.cpp", "wxtree.cpp", "test.h", "wxtree.h", 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 wxTreeLayout project"); + wxString msg("Could not generate hhp2cached project"); wxMessageBox(msg); } - // OGLEdit + // OGLEdit. We have to do it the long way because we need to add the extra ogl.lib. + + project.SetIncludeDirs(wxStringList("../../../../include", "../../../include", 0)); + project.SetResourceIncludeDirs(wxStringList("../../../../include", "../../../include", 0)); + project.SetLibDirs(wxStringList("../../../../lib", "../../../lib", 0)); + project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../../src/ogl/Debug", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../../src/ogl/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0)); - 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.SetExtraLibs(wxStringList("ogl.lib", 0)); project.SetProjectName("OGLEditVC"); project.SetTargetName("ogledit"); - project.SetProjectPath(dir + wxString("/utils/ogl/samples/ogledit")); + project.SetProjectPath(dir + wxString("/contrib/samples/ogl/ogledit")); project.SetSourceFiles(wxStringList("ogledit.cpp", "doc.cpp", "palette.cpp", "view.cpp", "doc.h", "ogledit.h", "palette.h", "view.h", 0)); @@ -433,16 +459,17 @@ void MyApp::GenerateSamples(const wxString& dir) // OGL Studio - 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.SetIncludeDirs(wxStringList("../../../../include", "../../../include", 0)); + project.SetResourceIncludeDirs(wxStringList("../../../../include", "../../../include", 0)); + project.SetLibDirs(wxStringList("../../../../lib", "../../../lib", 0)); + project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../../src/ogl/Debug", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0)); + project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../../src/ogl/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0)); + project.SetExtraLibs(wxStringList("ogl.lib", 0)); project.SetProjectName("StudioVC"); project.SetTargetName("studio"); - project.SetProjectPath(dir + wxString("/utils/ogl/samples/studio")); + project.SetProjectPath(dir + wxString("/contrib/samples/ogl/studio")); project.SetSourceFiles(wxStringList("studio.cpp", "cspalette.cpp", "dialogs.cpp", "view.cpp", "doc.cpp", "mainfrm.cpp", "project.cpp", "shapes.cpp", "symbols.cpp", "csprint.cpp", "studio.h", "cspalette.h", "dialogs.h", "view.h", @@ -454,71 +481,6 @@ void MyApp::GenerateSamples(const wxString& dir) wxString msg("Could not generate OGL Studio project"); wxMessageBox(msg); } - - // GLCanvas cube sample - - 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.SetExtraLibs(wxStringList("glcanvas.lib", "opengl32.lib", "glu32.lib", 0)); - - project.SetProjectName("CubeVC"); - project.SetTargetName("cube"); - project.SetProjectPath(dir + wxString("/utils/glcanvas/samples/cube")); - project.SetSourceFiles(wxStringList("cube.cpp", "cube.h", - 0)); - - if (!project.GenerateVCProject()) - { - wxString msg("Could not generate GLCanvas Cube project"); - wxMessageBox(msg); - } - - // GLCanvas isosurf sample - - 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.SetExtraLibs(wxStringList("glcanvas.lib", "opengl32.lib", "glu32.lib", 0)); - - project.SetProjectName("IsoSurfVC"); - project.SetTargetName("isosurf"); - project.SetProjectPath(dir + wxString("/utils/glcanvas/samples/isosurf")); - project.SetSourceFiles(wxStringList("isosurf.cpp", "isosurf.h", - 0)); - - if (!project.GenerateVCProject()) - { - wxString msg("Could not generate GLCanvas IsoSurf project"); - wxMessageBox(msg); - } - - // GLCanvas penguin sample - - 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.SetExtraLibs(wxStringList("glcanvas.lib", "opengl32.lib", "glu32.lib", 0)); - - project.SetProjectName("PenguinVC"); - project.SetTargetName("penguin"); - project.SetProjectPath(dir + wxString("/utils/glcanvas/samples/penguin")); - project.SetSourceFiles(wxStringList("penguin.cpp", "penguin.h", - "lw.cpp", "lw.h", - "trackball.c", "trackball.h", - 0)); - - if (!project.GenerateVCProject()) - { - wxString msg("Could not generate GLCanvas Penguin project"); - wxMessageBox(msg); - } } // ---------------------------------------------------------------------------- @@ -998,7 +960,7 @@ MyDialog::MyDialog(const wxString& title, const wxPoint& pos, const wxSize& size void MyDialog::OnQuit(wxCommandEvent& event) { - this->Destroy(); + this->EndModal(wxID_OK); } void MyDialog::OnAbout(wxCommandEvent& event)