{
wxString relativeIncludePath(relativeRootPath + wxString("/include"));
wxString relativeLibPath(relativeRootPath + wxString("/lib"));
+#if 0
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"));
+#endif
wxProject project;
project.SetIncludeDirs(wxStringList((const char*) relativeIncludePath, 0));
project.SetResourceIncludeDirs(wxStringList((const char*) relativeIncludePath, 0));
project.SetLibDirs(wxStringList((const char*) relativeLibPath, 0));
+#if 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));
+#endif
+
+ project.SetExtraLibsRelease(wxStringList("opengl32.lib", "glu32.lib", 0));
+ project.SetExtraLibsDebug(wxStringList("opengl32.lib", "glu32.lib", 0));
project.SetProjectName(projectName);
project.SetTargetName(targetName);
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),
"../../..");
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));
+ GenerateSample("PlotVC", "plot", dir + wxString("/samples/plot"), wxStringList("plot.cpp", 0));
//// Demos
project.SetIncludeDirs(wxStringList("../../../include", 0));
project.SetResourceIncludeDirs(wxStringList("../../../include", 0));
project.SetLibDirs(wxStringList("../../../lib", 0));
+#if 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));
+#endif
project.SetProjectName("DialogEdVC");
project.SetTargetName("dialoged");
project.SetIncludeDirs(wxStringList("../../../include", 0));
project.SetResourceIncludeDirs(wxStringList("../../../include", 0));
project.SetLibDirs(wxStringList("../../../lib", 0));
+#if 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));
+#endif
project.SetProjectName("Tex2RTFVC");
project.SetTargetName("tex2rtf");
project.SetIncludeDirs(wxStringList("../../../include", 0));
project.SetResourceIncludeDirs(wxStringList("../../../include", 0));
project.SetLibDirs(wxStringList("../../../lib", 0));
+#if 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));
+#endif
project.SetProjectName("HelpGenVC");
project.SetTargetName("helpgen");
project.SetIncludeDirs(wxStringList("../../include", 0));
project.SetResourceIncludeDirs(wxStringList("../../include", 0));
project.SetLibDirs(wxStringList("../../lib", 0));
+#if 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));
+#endif
project.SetProjectName("ProjGenVC");
project.SetTargetName("makeproj");
project.SetIncludeDirs(wxStringList("../../include", 0));
project.SetResourceIncludeDirs(wxStringList("../../include", 0));
project.SetLibDirs(wxStringList("../../lib", 0));
+#if 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));
+#endif
project.SetProjectName("hhp2cachedVC");
project.SetTargetName("hhp2cached");
wxMessageBox(msg);
}
- // wxTreeLayout sample
-
- 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));
-
- if (!project.GenerateVCProject())
- {
- wxString msg("Could not generate wxTreeLayout 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", "../../src", 0));
- project.SetResourceIncludeDirs(wxStringList("../../../../include", 0));
- project.SetLibDirs(wxStringList("../../../../lib", 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.SetIncludeDirs(wxStringList("../../../../include", "../../../include", 0));
+ project.SetResourceIncludeDirs(wxStringList("../../../../include", "../../../include", 0));
+ project.SetLibDirs(wxStringList("../../../../lib", "../../../lib", 0));
+#if 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));
+#endif
- project.SetExtraLibs(wxStringList("ogl.lib", 0));
+ project.SetExtraLibsDebug(wxStringList("ogld.lib", 0));
+ project.SetExtraLibsRelease(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));
// 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", "../../../../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.SetIncludeDirs(wxStringList("../../../../include", "../../../include", 0));
+ project.SetResourceIncludeDirs(wxStringList("../../../../include", "../../../include", 0));
+ project.SetLibDirs(wxStringList("../../../../lib", "../../../lib", 0));
+#if 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));
+#endif
+ project.SetExtraLibsDebug(wxStringList("ogld.lib", 0));
+ project.SetExtraLibsRelease(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",
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", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0));
- project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0));
+ // MMedia mmboard
- 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", "../../../../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");
- 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);
- }
+ project.SetIncludeDirs(wxStringList("../../../include", "../../include", 0));
+ project.SetResourceIncludeDirs(wxStringList("../../../include", 0));
+ project.SetLibDirs(wxStringList("../../../lib", "../../lib", 0));
+ project.SetExtraLibsDebug(wxStringList("mmediad.lib", 0));
+ project.SetExtraLibsRelease(wxStringList("mmedia.lib", 0));
- // 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", "../../../../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");
- 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));
+ project.SetProjectName("MMboardVC");
+ project.SetTargetName("mmboard");
+ project.SetProjectPath(dir + wxString("/contrib/samples/mmedia"));
+ project.SetSourceFiles(wxStringList("mmboard.cpp", "mmboard.h", "mmbman.cpp", "mmbman.h", 0));
if (!project.GenerateVCProject())
{
- wxString msg("Could not generate GLCanvas Penguin project");
+ wxString msg("Could not generate MMboard project");
wxMessageBox(msg);
}
}
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 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();
+ 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 winmm.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 winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib ";
+ n = m_extraLibsRelease.Number();
for (i = 0; i < n; i++)
{
- wxString lib = m_extraLibs[i];
+ wxString lib = m_extraLibsRelease[i];
stream << lib << " ";
}
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 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();
+ 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 winmm.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 winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ";
+ n = m_extraLibsDebug.Number();
for (i = 0; i < n; i++)
{
- wxString lib = m_extraLibs[i];
+ wxString lib = m_extraLibsDebug[i];
stream << lib << " ";
}
stream << "/nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:\"libcd.lib,libcid.lib,msvcrt.lib\" /out:\"Debug/" << m_targetName << ".exe\" /pdbtype:sept";
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 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();
+ 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 winmm.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 winmm.lib wxdlld.lib ";
+ n = m_extraLibsDebug.Number();
for (i = 0; i < n; i++)
{
- wxString lib = m_extraLibs[i];
+ wxString lib = m_extraLibsDebug[i];
stream << lib << " ";
}
stream << "/nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:\"libcd.lib\" /nodefaultlib:\"libcid.lib\" /out:\"DebugDLL/" << m_targetName << ".exe\" /pdbtype:sept";
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 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();
+ 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 winmm.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 winmm.lib wxdll.lib ";
+ n = m_extraLibsRelease.Number();
for (i = 0; i < n; i++)
{
- wxString lib = m_extraLibs[i];
+ wxString lib = m_extraLibsRelease[i];
stream << lib << " ";
}
stream << "/nologo /subsystem:windows /machine:I386 /nodefaultlib:\"libc.lib\" /nodefaultlib:\"libci.lib\" /out:\"ReleaseDLL/" << m_targetName << ".exe\"";
projects / wxWidgets.git / blobdiff