--- /dev/null
+#
+# File: makefile.b32
+# Author: Julian Smart
+# Created: 1999
+# Updated:
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=mmboard
+EXTRALIBS=$(WXDIR)\contrib\lib\mmedia.lib
+OBJECTS = $(TARGET).obj mmbman.obj
+
+!include $(WXDIR)\src\makeprog.b32
+
--- /dev/null
+#
+# File: makefile.bcc
+# Author: Julian Smart
+# Created: 1998
+# Updated:
+#
+# Builds a BC++ 16-bit sample
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=mmboard
+EXTRALIBS=$(WXDIR)\contrib\lib\mmedia.lib
+OBJECTS=$(TARGET).obj mmbman.obj
+
+!include $(WXDIR)\src\makeprog.bcc
+
--- /dev/null
+#
+# File: makefile.dos
+# Author: Julian Smart
+# Created: 1998
+# Updated:
+#
+# Makefile : Builds 16-bit sample, VC++ 1.5
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+WXDIR = $(WXWIN)
+
+TARGET=minimal
+OBJECTS=$(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.msc
+
--- /dev/null
+#
+# File: makefile.g95
+# Author: Julian Smart
+# Created: 1999
+# Updated:
+# Copyright: (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../../..
+
+TARGET=mmboard
+EXTRALIBS=-lmmedia
+OBJECTS = $(TARGET).o mmbman.o
+
+include $(WXDIR)/src/makeprog.g95
+
--- /dev/null
+#
+# File: makefile.vc
+# Author: Julian Smart
+# Created: 1999
+# Updated:
+# Copyright: (c) Julian Smart
+#
+# Makefile : Builds sample (VC++, WIN32)
+# Use FINAL=1 argument to nmake to build final version with no debug info.
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+PROGRAM=mmboard
+
+!if "$(FINAL)" == "0"
+EXTRALIBS=$(WXDIR)\contrib\lib\mmediad.lib
+!else
+EXTRALIBS=$(WXDIR)\contrib\lib\mmedia.lib
+!endif
+
+OBJECTS = $(PROGRAM).obj mmbman.obj
+
+!include $(WXDIR)\src\makeprog.vc
+
--- /dev/null
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+#
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = mmboard
+OBJECTS = $(PROGRAM).obj mmbman.obj
+
+!include $(WXDIR)\src\makeprog.wat
+
// We test the Windows sound support.
dev = new wxSoundStreamWin();
- if (dev->GetError() == wxSOUND_NOERR)
+ if (dev->GetError() == wxSOUND_NOERROR)
caps |= MM_SOUND_WIN;
delete dev;
#endif
FINAL=0
!if "$(FINAL)" == "0"
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl_d.lib
+EXTRALIBS=$(WXDIR)\contrib\lib\ogld.lib
!else
EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
!endif
FINAL=0
!if "$(FINAL)" == "0"
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl_d.lib
+EXTRALIBS=$(WXDIR)\contrib\lib\ogld.lib
!else
EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
!endif
--- /dev/null
+# Microsoft Developer Studio Project File - Name="MmediaVC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=MmediaVC - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "MmediaVC.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "MmediaVC.mak" CFG="MmediaVC - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "MmediaVC - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "MmediaVC - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "MmediaVC - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# 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 "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\mmedia.lib"
+
+!ELSEIF "$(CFG)" == "MmediaVC - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# 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 "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\mmediad.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "MmediaVC - Win32 Release"
+# Name "MmediaVC - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\cdbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\cdwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\g711.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\g721.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\g723_24.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\g723_40.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\g72x.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sndaiff.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sndbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sndcodec.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sndcpcm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sndfile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sndg72x.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sndpcm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sndulaw.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sndwav.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sndwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\vidbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\vidwin.cpp
+# End Source File
+# End Target
+# End Project
--- /dev/null
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "MmediaVC"=.\MmediaVC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- /dev/null
+# Microsoft Developer Studio Project File - Name="OglVC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=OglVC - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "OglVC.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "OglVC.mak" CFG="OglVC - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "OglVC - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "OglVC - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "OglVC - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# 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 "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\ogl.lib"
+
+!ELSEIF "$(CFG)" == "OglVC - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# 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 "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\ogld.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "OglVC - Win32 Release"
+# Name "OglVC - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\basic.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\basic2.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\bmpshape.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\canvas.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\composit.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\constrnt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\divided.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\drawn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\lines.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\mfutils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ogldiag.cpp
+# End Source File
+# End Target
+# End Project
--- /dev/null
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "OglVC"=.\OglVC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
OGLINC = $(WXDIR)\contrib\include\wx\ogl
THISDIR = $(WXDIR)\src\ogl
EXTRAFLAGS=/DPROLOGIO=1
-DOCDIR=$(WXDIR)\docs
-LOCALDOCDIR=$(WXDIR)\docs\latex\ogl
+DOCDIR=$(WXDIR)\contrib\docs
+LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\ogl
!include $(WXDIR)\src\makevc.env
utils/dialoged/test/*.prj
utils/dialoged/test/*.bmp
-utils/wxMMedia2/makefile*
-utils/wxMMedia2/README
-utils/wxMMedia2/lib/*.h
-utils/wxMMedia2/lib/*.cpp
-utils/wxMMedia2/lib/*.def
-utils/wxMMedia2/lib/*.rc
-utils/wxMMedia2/lib/makefile*
-utils/wxMMedia2/sample/*.h
-utils/wxMMedia2/sample/*.cpp
-utils/wxMMedia2/sample/makefile*
-utils/wxMMedia2/sample/*.xbm
-utils/wxMMedia2/sample/*.xpm
-utils/wxMMedia2/sample/*.txt
-utils/wxMMedia2/board/*.cpp
-utils/wxMMedia2/board/*.def
-utils/wxMMedia2/board/make*
+contrib/src/mmedia/makefile*
+contrib/src/mmedia/README
+contrib/src/mmedia/lib/*.h
+contrib/src/mmedia/lib/*.cpp
+contrib/src/mmedia/lib/makefile*
+contrib/samples/mmedia/*.h
+contrib/samples/mmedia/*.cpp
+contrib/samples/mmedia/makefile*
+contrib/samples/mmedia/*.xbm
+contrib/samples/mmedia/*.xpm
+contrib/samples/mmedia/*.ico
+contrib/samples/mmedia/*.txt
+contrib/samples/mmedia/*.rc
+contrib/samples/mmedia/*.def
samples/*.txt
samples/makefile*
src/wxvc_dll.dsp
src/wxvc_dll.dsw
-src/ogl/OglVC.dsp
-src/ogl/OglVC.dsw
-
src/jpeg/jpeg.dsp
src/jpeg/jpeg.dsw
src/tiff/tiff.dsp
src/tiff/tiff.dsw
+src/zlib/zlib.dsp
+src/zlib/zlib.dsw
+
+src/png/png.dsp
+src/png/png.dsw
+
+src/xpm/xpm.dsp
+src/xpm/xpm.dsw
+
samples/calendar/CalendarVC.dsp
samples/calendar/CalendarVC.dsw
samples/docview/DocviewVC.dsp
samples/docview/DocviewVC.dsw
-samples/docvwmdi/DocVwVC.dsp
-samples/docvwmdi/DocVwVC.dsw
+samples/docvwmdi/DocVwMdiVC.dsp
+samples/docvwmdi/DocVwMdiVC.dsw
samples/drawing/DrawingVC.dsp
samples/drawing/DrawingVC.dsw
samples/help/HelpVC.dsp
samples/help/HelpVC.dsw
-samples/html/AboutVC.dsp
-samples/html/AboutVC.dsw
-samples/html/HelpVC.dsp
-samples/html/HelpVC.dsw
-samples/html/HelpViewVC.dsp
-samples/html/HelpViewVC.dsw
-samples/html/PrintingVC.dsp
-samples/html/PrintingVC.dsw
-samples/html/TestVC.dsp
-samples/html/TestVC.dsw
-samples/html/VirtualVC.dsp
-samples/html/VirtualVC.dsw
-samples/html/WidgetVC.dsp
-samples/html/WidgetVC.dsw
-samples/html/ZipVC.dsp
-samples/html/ZipVC.dsw
+samples/html/about/AboutVC.dsp
+samples/html/about/AboutVC.dsw
+samples/html/help/HelpVC.dsp
+samples/html/help/HelpVC.dsw
+samples/html/helpview/HelpViewVC.dsp
+samples/html/helpview/HelpViewVC.dsw
+samples/html/printing/PrintingVC.dsp
+samples/html/printing/PrintingVC.dsw
+samples/html/test/TestVC.dsp
+samples/html/test/TestVC.dsw
+samples/html/virtual/VirtualVC.dsp
+samples/html/virtual/VirtualVC.dsw
+samples/html/widget/WidgetVC.dsp
+samples/html/widget/WidgetVC.dsw
+samples/html/zip/ZipVC.dsp
+samples/html/zip/ZipVC.dsw
samples/image/ImageVC.dsp
samples/image/ImageVC.dsw
samples/scroll/ScrollVC.dsp
samples/scroll/ScrollVC.dsw
-samples/scrollsub/ScrollVC.dsp
-samples/scrollsub/ScrollVC.dsw
+samples/scrollsub/ScrollsubVC.dsp
+samples/scrollsub/ScrollsubVC.dsw
samples/sockets/ClientVC.dsp
samples/sockets/ServerVC.dsw
samples/treectrl/TreectrlVC.dsp
samples/treectrl/TreeCtrlVC.dsw
+samples/treelay/TreelayVC.dsp
+samples/treelay/TreelayVC.dsw
+
samples/typetest/TypetestVC.dsp
samples/typetest/TypetestVC.dsw
samples/opengl/penguin/PenguinVC.dsp
samples/opengl/penguin/PenguinVC.dsw
-samples/ogl/ogledit/OgleditVC.dsp
-samples/ogl/ogledit/OgleditVC.dsw
-samples/ogl/studio/StudioVC.dsp
-samples/ogl/studio/StudioVC.dsw
-
-samples/treelay/TreeSampleVC.dsp
-samples/treelay/TreeSampleVC.dsw
-
demos/bombs/BombsVC.dsp
demos/bombs/BombsVC.dsw
utils/tex2rtf/src/Tex2RTFVC.dsp
utils/tex2rtf/src/Tex2RTFVC.dsw
+contrib/src/ogl/OglVC.dsp
+contrib/src/ogl/OglVC.dsw
+
+contrib/samples/ogl/ogledit/OgleditVC.dsp
+contrib/samples/ogl/ogledit/OgleditVC.dsw
+contrib/samples/ogl/studio/StudioVC.dsp
+contrib/samples/ogl/studio/StudioVC.dsw
+
+contrib/src/mmedia/MmediaVC.dsp
+contrib/src/mmedia/MMediaVC.dsw
+
+contrib/samples/mmedia/MmboardVC.dsp
+contrib/samples/mmedia/MmboardVC.dsw
docs/winhelp/*.hlp
docs/winhelp/*.cnt
+contrib/docs/winhelp/*.hlp
+contrib/docs/winhelp/*.cnt
docs/html/wx/*.htm
docs/html/wx/*.gif
-docs/html/porting/*.htm
-docs/html/porting/*.gif
-docs/html/faq/*.htm
-docs/html/faq/*.gif
-docs/html/techref/*.htm
-docs/html/techref/*.gif
docs/html/dialoged/*.htm
docs/html/dialoged/*.gif
-docs/html/wxtree/*.htm
-docs/html/wxtree/*.gif
-
-docs/html/wxgraph/*.htm
-docs/html/wxgraph/*.gif
-
-docs/html/wxhelp/*.htm
-docs/html/wxhelp/*.gif
-
-docs/html/proplist/*.htm
-docs/html/proplist/*.gif
-
-docs/html/winstall/*.htm
-docs/html/winstall/*.gif
-
docs/html/tex2rtf/*.htm
docs/html/tex2rtf/*.gif
set wise=0
Rem Set this to the required version
-set version=2_1_13
+set version=2_1_14
if "%src" == "" goto usage
if "%dest" == "" goto usage
Constructs a notebook control.
+Note that sometimes you can reduce flicker by passing the wxCLIP\_CHILDREN window style.
+
\wxheading{Parameters}
\docparam{parent}{The parent window. Must be non-NULL.}
Visual C++ 4.0/5.0/6.0 compilation
----------------------------------
-Using project files:
+Using project files (VC++ 5 and 6 only):
1. Unarchive wx2_x_y_vc.zip, the VC++ 5/6 project makefiles.
-2. Open src/wxvc.dsp, set Debug or Release configuration, and
- compile. This will produce src/Debug/wxvc.lib or
- src/Release/wxvc.lib. The project file src/wxvc_dll.dsp
- will make a DLL version of wxWindow, which will go in
- src/DebugDLL/wxvc.[lib,dll] and src/ReleaseDLL/wxvc.[lib,dll].
-3. If you want to use JPEG in your application (such as the image
- sample), open src/jpeg/jpeg.dsp (VC++ 5/6 only) and compile in
- Debug and Release configurations. If you have VC++ 4,
- use makefile.vc, but you may only have one set of object
- files at a time in use (debug or release versions).
-4. Similarly for TIFF: use src/tiff/tiff.dsp.
-5. Open a sample project file, choose a configuration using
- Build | Set Active Configuration..., and compile.
- The project files don't use precompiled headers, to save
+2. Open src/wxvc.dsp, set Debug or Release configuration for
+ the wxvc project, and compile. Alternatively, use Batch Build
+ to build both Debug and Release configurations.
+ This will produce lib/wx.lib (release) and lib/wxd.lib (debug),
+ plus various subordinate libraries. It assumes you have
+ the TIFF and JPEG source, which is already in the setup
+ version of the distribution.
+ The project file src/wxvc_dll.dsp will make a DLL version of wxWindow,
+ which will go in lib/wxdll.[lib,dll] and lib/wxdlld.[lib,dll].
+3. Open a sample project file, choose a configuration such as
+ Debug using Build | Set Active Configuration..., and compile.
+ The project files don't use precompiled headers, to save disk
space, but you can switch PCH compiling on for greater speed.
Using makefiles:
4. Change directory to wx\samples and type 'nmake -f makefile.vc'
to make all the samples. You can also make them individually.
-Notes:
+Makefile notes:
Use the 'clean' target to clean all objects, libraries and
executables.
suitable precompiled header file for compiling applications.
The resulting libraries are called:
- wx\lib\wx200.lib(dll) (debug version)
- wx\lib\wx200.lib(dll) (release version, using FINAL=1)
+ wx\lib\wx[version].lib(dll) (debug version)
+ wx\lib\wx[version].lib(dll) (release version, using FINAL=1)
2. Invoke a sample makefile with 'nmake -f makefile.vc WXUSINGDLL=1'
(or edit src\makeprog.vc to set WXUSINGDLL to 1 for all
within wxWindows.
Note (2): libraries and applications generated with makefiles and
-project files are unlikely to be compatible, so use one method or
-the other.
+project files are now (hopefully) compatible where static libraries
+are concerned, but please exercise caution nevertheless and if
+possible, use one method or the other.
Note (3): VC++ 5's optimization code seems to be broken and can
cause both compile and run-time problems: this can be seen when
#include "wx/log.h"
+#if !wxUSE_GLCANVAS
+#error Please set wxUSE_GLCANVAS to 1 in setup.h.
+#endif
+
#include "cube.h"
#ifndef __WXMSW__ // for wxStopWatch, see remark below
#include "wx/wx.h"
#endif
+#if !wxUSE_GLCANVAS
+#error Please set wxUSE_GLCANVAS to 1 in setup.h.
+#endif
+
#include "wx/timer.h"
#include "wx/glcanvas.h"
#include "wx/wx.h"
#endif
+#if !wxUSE_GLCANVAS
+#error Please set wxUSE_GLCANVAS to 1 in setup.h.
+#endif
+
#include "penguin.h"
#include <GL/glu.h>
DECLARE_EVENT_TABLE()
};
-
class TestGLCanvas: public wxGLCanvas
{
public:
*/
void wxMemStruct::ErrorMsg (const char * mesg)
{
- wxLogDebug(wxT("wxWindows memory checking error: %s"), mesg);
+ wxLogMessage(wxT("wxWindows memory checking error: %s"), mesg);
PrintNode ();
// << m_fileName << ' ' << m_lineNum << endl;
*/
void wxMemStruct::ErrorMsg ()
{
- wxLogDebug(wxT("wxWindows over/underwrite memory error:"));
+ wxLogMessage(wxT("wxWindows over/underwrite memory error:"));
PrintNode ();
// cerr << m_fileName << ' ' << m_lineNum << endl;
msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
- wxLogDebug(msg);
+ wxLogMessage(msg);
}
else
{
msg2.Printf(wxT(" at $%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
- wxLogDebug(msg);
+ wxLogMessage(msg);
}
}
msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
- wxLogDebug(msg);
+ wxLogMessage(msg);
}
else
{
wxString msg2("");
msg2.Printf(wxT("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
msg += msg2;
- wxLogDebug(msg);
+ wxLogMessage(msg);
}
}
else {
// Can't use the error routines as we have no recognisable object.
#ifndef __WXGTK__
- wxLogDebug(wxT("Can't verify memory struct - all bets are off!"));
+ wxLogMessage(wxT("Can't verify memory struct - all bets are off!"));
#endif
}
return 0;
{
appNameStr = wxTheApp->GetAppName();
appName = WXSTRINGCAST appNameStr;
- wxLogDebug(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+ wxLogMessage(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
}
else
{
- wxLogDebug( wxT("----- Memory dump -----") );
+ wxLogMessage( wxT("----- Memory dump -----") );
}
}
TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
- wxLogDebug( wxT("") );
- wxLogDebug( wxT("") );
+ wxLogMessage( wxT("") );
+ wxLogMessage( wxT("") );
return TRUE;
#else
{
appNameStr = wxTheApp->GetAppName();
appName = WXSTRINGCAST appNameStr;
- wxLogDebug(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+ wxLogMessage(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
}
else
{
- wxLogDebug( wxT("----- Memory statistics -----") );
+ wxLogMessage( wxT("----- Memory statistics -----") );
}
}
{
while (list)
{
- wxLogDebug(wxT("%ld objects of class %s, total size %ld"),
+ wxLogMessage(wxT("%ld objects of class %s, total size %ld"),
list->instanceCount, list->instanceClass, list->totalSize);
wxDebugStatsStruct *old = list;
list = old->next;
free((char *)old);
}
- wxLogDebug(wxT(""));
+ wxLogMessage(wxT(""));
}
SetDebugMode(currentMode);
- wxLogDebug(wxT("Number of object items: %ld"), noObjectNodes);
- wxLogDebug(wxT("Number of non-object items: %ld"), noNonObjectNodes);
- wxLogDebug(wxT("Total allocated size: %ld"), totalSize);
- wxLogDebug(wxT(""));
- wxLogDebug(wxT(""));
+ wxLogMessage(wxT("Number of object items: %ld"), noObjectNodes);
+ wxLogMessage(wxT("Number of non-object items: %ld"), noNonObjectNodes);
+ wxLogMessage(wxT("Total allocated size: %ld"), totalSize);
+ wxLogMessage(wxT(""));
+ wxLogMessage(wxT(""));
return TRUE;
#else
{
appNameStr = wxTheApp->GetAppName();
appName = WXSTRINGCAST appNameStr;
- wxLogDebug(wxT("----- Classes in %s -----"), appName);
+ wxLogMessage(wxT("----- Classes in %s -----"), appName);
}
}
if (info->GetConstructor())
msg += wxT(": dynamic");
- wxLogDebug(msg);
+ wxLogMessage(msg);
}
node = wxClassInfo::sm_classTable->Next();
n ++;
}
- wxLogDebug(wxT(""));
- wxLogDebug(wxT("There are %d classes derived from wxObject."), n);
- wxLogDebug(wxT(""));
- wxLogDebug(wxT(""));
+ wxLogMessage(wxT(""));
+ wxLogMessage(wxT("There are %d classes derived from wxObject."), n);
+ wxLogMessage(wxT(""));
+ wxLogMessage(wxT(""));
return TRUE;
}
int totSize = wxDebugContext::TotSize (size);
char * buf = (char *) malloc(totSize);
if (!buf) {
- wxLogDebug(wxT("Call to malloc (%ld) failed."), (long)size);
+ wxLogMessage(wxT("Call to malloc (%ld) failed."), (long)size);
return 0;
}
wxMemStruct * st = (wxMemStruct *)buf;
::GetLocalTime(&st);
val += st.wMilliseconds;
#else
+#ifndef __VISUALC__
#warning "wxStopWatch will be up to second resolution!"
+#endif
#endif
return val;
type,
this,
row, col,
- false,
+ TRUE,
mouseEv.GetX(), mouseEv.GetY(),
mouseEv.ControlDown(),
mouseEv.ShiftDown(),
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\jpeg.lib"
!ELSEIF "$(CFG)" == "jpeg - Win32 Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
# ADD BASE RSC /l 0x809
# ADD RSC /l 0x809
BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\jpegd.lib"
!ENDIF
rdcolmap.obj cdjpeg.obj
TROBJECTS= jpegtran.obj rdswitch.obj cdjpeg.obj transupp.obj
+!if "$(FINAL)" == "1"
LIBTARGET=..\..\lib\jpeg.lib
+!else
+LIBTARGET=..\..\lib\jpegd.lib
+!endif
# Note: we have to put this first, to override the default definition
# which doesn't work because there are too many files on the command line.
WAITFLAG=/w
# If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally
-#WINFLAGS=-c -W3 -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
-WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
-#WINLINKFLAGS=/NODEFAULTLIB /INCREMENTAL:NO /NOLOGO -align:0x1000 -machine:$(CPU) -subsystem:windows,$(APPVER)
+#WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
+WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -DWIN32 -D__WIN32__ -D_WINDOWS $(WINVERSION)
WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
-#WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib libc.lib oldnames.lib\
-# comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib # libci.lib # libci.lib required for VC++ 4.2
-
WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\
comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2
-##WINLIBS=kernel32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib \
-## comctl32.lib ole32.lib oleaut32.lib rpcrt4.lib winmm.lib
-
-#winspool.lib winmm.lib shell32.lib oldnames.lib\
-# ctl3d32.lib odbc32.lib uuid.lib rpcrt4.lib # libci.lib # libci.lib required for VC++ 4.2
-
-
# Set a WXWIN environment variable be the path to your WXWIN directory
WXDIR=$(WXWIN)
!endif
# This sets 'D' to a suitable directory name
-# for this kind of build, and WXLIBNAME to one of wx (static release), wx_d (static debug),
-# wx$(WXVERSION) (DLL release), wx$(WXVERSION)_d (DLL debug)
+# for this kind of build, and WXLIBNAME to one of wx (static release), wxd (static debug),
+# wx$(WXVERSION) (DLL release), wx$(WXVERSION)d (DLL debug)
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
WXLIBNAME=wx$(WXVERSION)
D=Release
!else
D=Debug
-LIBEXT=_d
+LIBEXT=d
WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
!endif
WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
-INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff $(EXTRAINC)
-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\xpm.lib
+INC=-I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff $(EXTRAINC)
+LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib
MAKEPRECOMP=/YcWX/WXPREC.H
OPTIONS=
PRECOMP=
MAKEPRECOMP=
!else
-PCH=$(WXLIBNAME).pch
-PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb
+PCH=wxvc.pch
+PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$D\vc60.pdb
MAKEPRECOMP=/YcWX/WXPREC.H
!endif
!else
!if "$(WXMAKINGDLL)" == "1"
-PCH=$(WXLIBNAME).pch
+PCH=wxvc.pch
DUMMY=dummydll
!else
-PCH=$(WXLIBNAME).pch
+PCH=wxvc.pch
DUMMY=dummy
!endif
-PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb
+PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb
CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
// wxDebugContext, too.
if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
{
- wxLogDebug(wxT("There were memory leaks."));
+ wxLogMessage(wxT("There were memory leaks."));
wxDebugContext::Dump();
wxDebugContext::PrintStatistics();
}
-# This file was automatically generated by tmake at 16:52, 2000/02/29
+# This file was automatically generated by tmake at 05:31, 2000/03/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
#
$(MSWDIR)\choicdgg.obj \
$(MSWDIR)\dragimgg.obj \
$(MSWDIR)\grid.obj \
+ $(MSWDIR)\gridsel.obj \
$(MSWDIR)\laywin.obj \
$(MSWDIR)\logg.obj \
$(MSWDIR)\numdlgg.obj \
$(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
+$(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
+
$(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
$(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
-# This file was automatically generated by tmake at 16:52, 2000/02/29
+# This file was automatically generated by tmake at 05:31, 2000/03/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
#
$(MSWDIR)\dirdlgg.obj \
$(MSWDIR)\dragimgg.obj \
$(MSWDIR)\grid.obj \
+ $(MSWDIR)\gridsel.obj \
$(MSWDIR)\imaglist.obj \
$(MSWDIR)\laywin.obj \
$(MSWDIR)\listctrl.obj \
$(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
+$(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
+
$(MSWDIR)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)
$(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
-# This file was automatically generated by tmake at 15:56, 2000/02/29
+# This file was automatically generated by tmake at 10:10, 2000/03/07
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
#
$(GENDIR)\dirdlgg.obj \
$(GENDIR)\dragimgg.obj \
$(GENDIR)\grid.obj \
+ $(GENDIR)\gridsel.obj \
$(GENDIR)\imaglist.obj \
$(GENDIR)\laywin.obj \
$(GENDIR)\listctrl.obj \
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
+$(GENDIR)/gridsel.obj: $*.$(SRCSUFF)
+ cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
$(GENDIR)/imaglist.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
$(GENDIR)/choicdgg.$(OBJSUFF) \
$(GENDIR)/dragimgg.$(OBJSUFF) \
$(GENDIR)/grid.$(OBJSUFF) \
+ $(GENDIR)/gridsel.$(OBJSUFF) \
$(GENDIR)/laywin.$(OBJSUFF) \
$(GENDIR)/logg.$(OBJSUFF) \
$(GENDIR)/numdlgg.$(OBJSUFF) \
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
# Normal, static library
-all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
+all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png$(LIBEXT) zlib$(LIBEXT) xpm$(LIBEXT) jpeg$(LIBEXT) tiff$(LIBEXT) $(LIBTARGET)
dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
#!/binb/wmake.exe
-# This file was automatically generated by tmake at 12:25, 2000/02/28
+# This file was automatically generated by tmake at 05:31, 2000/03/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
#
choicdgg.obj &
dragimgg.obj &
grid.obj &
+ gridsel.obj &
laywin.obj &
logg.obj &
numdlgg.obj &
grid.obj: $(GENDIR)\grid.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+gridsel.obj: $(GENDIR)\gridsel.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
laywin.obj: $(GENDIR)\laywin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
WINPNGDIR = ..\png
WINPNGINC = $(WINPNGDIR)
-WINPNGLIB = ..\..\lib\winpng.lib
+
+!if "$(FINAL)" == "1"
+WINPNGLIB=..\..\lib\png.lib
+!else
+WINPNGLIB=..\..\lib\pngd.lib
+!endif
INC = /I..\zlib
all: $(WINPNGLIB)
$(WINPNGLIB): $(OBJECTS)
- -erase $(WINPNGLIB)
+ -del $(WINPNGLIB)
lib @<<
-out:$(WINPNGLIB)
$(OBJECTS)
--- /dev/null
+# Microsoft Developer Studio Project File - Name="png" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=png - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "png.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "png.mak" CFG="png - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "png - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "png - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "png - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# 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 "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\zlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\png.lib"
+
+!ELSEIF "$(CFG)" == "png - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# 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 "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\pngd.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "png - Win32 Release"
+# Name "png - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\png.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngget.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngmem.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngpread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngrio.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngrtran.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngrutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngset.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngtrans.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngwio.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngwrite.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngwtran.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngwutil.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\png.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngconf.h
+# End Source File
+# End Group
+# End Target
+# End Project
--- /dev/null
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "png"=.\png.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
-
+!if "$(FINAL)" == "1"
LIBTARGET=$(WXDIR)\lib\tiff.lib
+!else
+LIBTARGET=$(WXDIR)\lib\tiffd.lib
+!endif
OBJECTS= \
tif_aux.obj \
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\tiff.lib"
!ELSEIF "$(CFG)" == "tiff - Win32 Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
# ADD BASE RSC /l 0x809
# ADD RSC /l 0x809
BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\tiffd.lib"
!ENDIF
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "msw/Release"
+# PROP Intermediate_Dir "msw/Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wx.lib"
!ELSEIF "$(CFG)" == "wxvc - Win32 Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "msw/Debug"
+# PROP Intermediate_Dir "msw/Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
# ADD BASE RSC /l 0x809
# ADD RSC /l 0x809
BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxd.lib"
!ENDIF
# End Source File
# Begin Source File
+SOURCE=.\generic\gridsel.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\generic\helpext.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=.\msw\dialup.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\msw\dib.cpp
# End Source File
# Begin Source File
SOURCE=.\msw\ole\uuid.cpp
# End Source File
# End Group
-# Begin Group "PNG Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\png\png.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\png.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngerror.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngget.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngmem.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngpread.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngread.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngrio.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngrtran.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngrutil.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngset.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngtrans.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngwio.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngwrite.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngwtran.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngwutil.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# End Group
-# Begin Group "XPM files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\xpm\attrib.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crbuffri.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crdatfri.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\create.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crifrbuf.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crifrdat.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\dataxpm.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\hashtab.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\imagexpm.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\info.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\misc.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\parse.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rdftodat.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rdftoi.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rgb.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\scan.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\simx.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\wrffrdat.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\wrffri.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# End Group
-# Begin Group "Zlib Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\zlib\adler32.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\compress.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\crc32.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\deflate.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\gzio.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\infblock.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\infcodes.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inffast.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inflate.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inftrees.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\infutil.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\trees.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\uncompr.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\zutil.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# End Group
# Begin Group "Setup"
# PROP Default_Filter ""
###############################################################################
+Project: "jpeg"=.\jpeg\jpeg.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "png"=.\png\png.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "tiff"=.\tiff\tiff.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "wxvc"=.\wxvc.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name zlib
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name xpm
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name png
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name jpeg
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name tiff
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xpm"=.\xpm\xpm.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "zlib"=.\zlib\zlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
Package=<4>
{{{
}}}
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "msw/ReleaseDLL"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# 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 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib uuid.lib rpcrt4.lib advapi32.lib winmm.lib /nologo /subsystem:windows /dll /machine:I386 /out:"ReleaseDLL/wxvc.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib uuid.lib rpcrt4.lib advapi32.lib winmm.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wxdll.dll"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "msw/DebugDLL"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib uuid.lib rpcrt4.lib advapi32.lib winmm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"DebugDLL/wxvc.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib uuid.lib rpcrt4.lib advapi32.lib winmm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wxdlld.dll" /pdbtype:sept
!ENDIF
# End Source File
# Begin Source File
+SOURCE=.\generic\gridsel.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\generic\helpext.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=.\msw\dialup.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\msw\dib.cpp
# End Source File
# Begin Source File
!ENDIF
+# End Source File
+# End Group
+# Begin Group "TIFF files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\tiff\tif_aux.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_close.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_codec.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_compress.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_dir.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_dirinfo.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_dirread.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_dirwrite.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_dumpmode.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_error.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_fax3.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_fax3sm.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_flush.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_getimage.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_jpeg.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_luv.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_lzw.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_next.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_open.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_packbits.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_pixarlog.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_predict.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_print.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_read.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_strip.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_swab.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_thunder.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_tile.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_version.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_warning.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_win32.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_write.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_zip.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group
# End Target
THISDIR=$(WXWIN)\src\xpm
+!if "$(FINAL)" == "1"
LIBTARGET=$(WXDIR)\lib\xpm.lib
+!else
+LIBTARGET=$(WXDIR)\lib\xpmd.lib
+!endif
XPMDIR=$(WXDIR)\src\xpm
--- /dev/null
+# Microsoft Developer Studio Project File - Name="xpm" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=xpm - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "xpm.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "xpm.mak" CFG="xpm - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "xpm - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xpm - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "xpm - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# 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 "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\xpm.lib"
+
+!ELSEIF "$(CFG)" == "xpm - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "xpm___Win32_Debug"
+# PROP BASE Intermediate_Dir "xpm___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\xpmd.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "xpm - Win32 Release"
+# Name "xpm - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\attrib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\crbuffri.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\crdatfri.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\create.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\crifrbuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\crifrdat.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dataxpm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hashtab.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\imagexpm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\info.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\parse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rdftodat.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rdftoi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rgb.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\scan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\simx.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\wrffrdat.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\wrffri.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\rgbtab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\simx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\xpm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\xpmi.h
+# End Source File
+# End Group
+# End Target
+# End Project
--- /dev/null
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "xpm"=.\xpm.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
LDFLAGS=$(MODEL)
O=.obj
+!if "$(FINAL)" == "1"
LIBTARGET=..\..\lib\zlib.lib
+!else
+LIBTARGET=..\..\lib\zlibd.lib
+!endif
# variables
OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
--- /dev/null
+# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=zlib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "zlib.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "zlib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# 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 "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\zlib.lib"
+
+!ELSEIF "$(CFG)" == "zlib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# 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 "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\zlibd.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "zlib - Win32 Release"
+# Name "zlib - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\gzio.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\infblock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\infcodes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\infutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zutil.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# End Target
+# End Project
--- /dev/null
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "zlib"=.\zlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
{
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));
- project.SetExtraLibs(wxStringList("opengl32.lib", "glu32.lib", 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("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");
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.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));
-
- project.SetExtraLibs(wxStringList("ogl.lib", 0));
+#endif
+ project.SetExtraLibsDebug(wxStringList("ogld.lib", 0));
+ project.SetExtraLibsRelease(wxStringList("ogl.lib", 0));
project.SetProjectName("StudioVC");
project.SetTargetName("studio");
wxString msg("Could not generate OGL Studio project");
wxMessageBox(msg);
}
+
+ // MMedia mmboard
+
+ 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));
+
+ 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 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\"";
void SetLibDirs(const wxStringList& dirs) { m_libDirs = dirs; }
void SetDebugLibDirs(const wxStringList& dirs) { m_debugLibDirs = dirs; }
void SetReleaseLibDirs(const wxStringList& dirs) { m_releaseLibDirs = dirs; }
- void SetExtraLibs(const wxStringList& libs) { m_extraLibs = libs; }
+ void SetExtraLibsDebug(const wxStringList& libs) { m_extraLibsRelease = libs; }
+ void SetExtraLibsRelease(const wxStringList& libs) { m_extraLibsDebug = libs; }
inline wxString GetProjectName() const { return m_projectName; }
inline wxString GetTargetName() const { return m_targetName; }
inline wxStringList GetLibDirs() const { return m_libDirs; }
inline wxStringList GetDebugLibDirs() const { return m_debugLibDirs; }
inline wxStringList GetReleaseLibDirs() const { return m_releaseLibDirs; }
- inline wxStringList GetExtraLibs() const { return m_extraLibs; }
+ inline wxStringList GetExtraLibsDebug() const { return m_extraLibsDebug; }
+ inline wxStringList GetExtraLibsRelease() const { return m_extraLibsRelease; }
protected:
wxString m_projectName;
wxStringList m_libDirs;
wxStringList m_debugLibDirs;
wxStringList m_releaseLibDirs;
- wxStringList m_extraLibs;
+ wxStringList m_extraLibsDebug;
+ wxStringList m_extraLibsRelease;
};
projects / wxWidgets.git / commitdiff
