Minor mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
parent
94fdced0a0
commit
963a1fcd6e
@ -292,8 +292,9 @@ void MyCanvas::OnLeftClick(double x, double y, int keys)
|
||||
}
|
||||
if (info)
|
||||
{
|
||||
view->GetDocument()->GetCommandProcessor()->Submit(new DiagramCommand(info->GetClassName(), OGLEDIT_ADD_SHAPE, (DiagramDocument *)view->GetDocument(), info,
|
||||
x, y));
|
||||
view->GetDocument()->GetCommandProcessor()->Submit(
|
||||
new DiagramCommand((char*) info->GetClassName(), OGLEDIT_ADD_SHAPE, (DiagramDocument *)view->GetDocument(), info,
|
||||
x, y));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
# Microsoft Developer Studio Project File - Name="StudioVC" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 5.00
|
||||
# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
@ -8,23 +7,24 @@
|
||||
CFG=StudioVC - 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
|
||||
!MESSAGE NMAKE /f "StudioVC.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "StudioVC.mak" CFG="StudioVC - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE
|
||||
!MESSAGE "StudioVC - Win32 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "StudioVC - Win32 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "StudioVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "StudioVC - Win32 Release DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
@ -47,8 +47,8 @@ RSC=rc.exe
|
||||
# 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 "../../../../contrib/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 MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# 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 ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
# 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 ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
@ -72,9 +72,9 @@ LINK32=link.exe
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../contrib/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 BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/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 BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# 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 ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
# 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 ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
@ -98,9 +98,9 @@ LINK32=link.exe
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../contrib/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" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/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" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -126,8 +126,8 @@ LINK32=link.exe
|
||||
# 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 "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -137,7 +137,7 @@ 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# 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 wx23_0.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
@ -147,26 +147,6 @@ LINK32=link.exe
|
||||
# Name "StudioVC - Win32 Release DLL"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\studio.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\cspalette.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
@ -182,7 +162,31 @@ SOURCE=.\cspalette.cpp
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\cspalette.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\csprint.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@ -202,28 +206,12 @@ SOURCE=.\dialogs.cpp
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\view.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
SOURCE=.\dialogs.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -242,11 +230,15 @@ SOURCE=.\doc.cpp
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\doc.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mainfrm.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
@ -262,11 +254,15 @@ SOURCE=.\mainfrm.cpp
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mainfrm.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\project.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
@ -282,11 +278,15 @@ SOURCE=.\project.cpp
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\project.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\shapes.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
@ -302,11 +302,45 @@ SOURCE=.\shapes.cpp
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\shapes.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\studio.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\studio.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\studio.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\symbols.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
@ -322,192 +356,16 @@ SOURCE=.\symbols.cpp
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\csprint.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\studio.h
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\cspalette.h
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dialogs.h
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\view.h
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\doc.h
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mainfrm.h
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\project.h
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\shapes.h
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\symbols.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\view.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
@ -522,14 +380,12 @@ SOURCE=.\symbols.h
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\studio.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
|
||||
SOURCE=.\view.h
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 5.00
|
||||
Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
625
distrib/msw/makeall.bat
Executable file
625
distrib/msw/makeall.bat
Executable file
@ -0,0 +1,625 @@
|
||||
Rem @echo off
|
||||
Rem This script compiles wxWindows and some samples/demos with
|
||||
Rem a range of compilers.
|
||||
Rem Note that it currently uses batch scripts local to Julian Smart's machine,
|
||||
Rem to set up the environment correctly.
|
||||
Rem This is a 4DOS batch file, though 4DOS dependencies have been kept to
|
||||
Rem a minimum.
|
||||
Rem Julian Smart, August 12th, 2000
|
||||
Rem TODO: making a Unicode distribution by modifying setup.h programmatically.
|
||||
Rem TODO: check differing setup.h options, again by programmatic modification
|
||||
|
||||
set WXDIR=%WXWIN%
|
||||
set FATWXWIN=%WXDIR%
|
||||
set FULLWXWIN=%WXDIR%
|
||||
if not %@INDEX["%WXDIR%","wxWindows"] == "-1" set FATWXWIN=%@PATH[%WXDIR%]wxwind~1
|
||||
if not %@INDEX["%WXDIR%","wxWindows"] == "-1" set FULLWXWIN=%@PATH[%WXDIR%]wxWindows
|
||||
|
||||
Rem The following line is for a specific environment -- edit, or comment out
|
||||
Rem Not working in 4NT?
|
||||
Rem if not %@INDEX["%WXDIR%","wx2stable"] == "-1" set FATWXWIN=c:\wx2sta~1\wxwind~1
|
||||
|
||||
echo Full wxWindows path is %FULLWXWIN%, FAT path is %FATWXWIN%
|
||||
set BUILDDEST=%TEMP%\wxWinBuild
|
||||
Rem Only carry on if we haven't specified a single target
|
||||
set CARRYON=0
|
||||
|
||||
rem goto end
|
||||
|
||||
if "%1" == "vc6" goto dovc6
|
||||
if "%1" == "bc55" goto dobc55
|
||||
if "%1" == "bc50" goto dobc50
|
||||
if "%1" == "ming2952" goto doming2952
|
||||
if "%1" == "cygwin11" goto docygwin11
|
||||
if "%1" == "vc1" goto dovc1
|
||||
if "%1" == "bc16" goto dobc16
|
||||
|
||||
set CARRYON=1
|
||||
|
||||
if not direxist %BUILDDEST% mkdir /S %BUILDDEST%
|
||||
|
||||
|
||||
:dovc6
|
||||
|
||||
cd %WXDIR%\samples
|
||||
erase /S *.exe
|
||||
cd %WXDIR%\demos
|
||||
erase /S *.exe
|
||||
cd %WXDIR%\contrib\samples
|
||||
erase /S *.exe
|
||||
cd %WXDIR%\utils\dialoged\src
|
||||
erase /S *.exe
|
||||
cd %WXDIR%\utils\tex2rtf\src
|
||||
erase /S *.exe
|
||||
|
||||
echo Starting wxWindows build at %_TIME, %_DATE
|
||||
|
||||
Rem First, VC++ 6.
|
||||
|
||||
echo === VC++ 6 ===
|
||||
echo ==============
|
||||
|
||||
Rem Set up the environment
|
||||
call msvc6
|
||||
|
||||
echo *** VC++ Debug ***
|
||||
Rem VC++ Debug
|
||||
cd %WXDIR%\src\msw
|
||||
nmake -f makefile.vc cleanall
|
||||
nmake -f makefile.vc
|
||||
if not direxist %BUILDDEST%\VC6Debug mkdir /S %BUILDDEST%\VC6Debug
|
||||
erase /F /Y %BUILDDEST%\VC6Debug
|
||||
cd %WXDIR%\samples
|
||||
nmake -f makefile.vc clean
|
||||
|
||||
Rem Make one sample, just to make sure Debug mode is OK
|
||||
cd %WXDIR%\samples\controls
|
||||
nmake -f makefile.vc
|
||||
copy controls.exe %BUILDDEST%\VC6Debug
|
||||
nmake -f makefile.vc clean
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
nmake -f makefile.vc cleanall
|
||||
|
||||
echo *** VC++ Release ***
|
||||
|
||||
nmake -f makefile.vc cleanall FINAL=1
|
||||
nmake -f makefile.vc FINAL=1
|
||||
|
||||
if not direxist %BUILDDEST%\VC6Release mkdir /S %BUILDDEST%\VC6Release
|
||||
erase /F /Y %BUILDDEST%\VC6Release
|
||||
|
||||
cd %WXDIR%\samples
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
nmake -f makefile.vc FINAL=1
|
||||
Rem Copy all executables to VC6Release
|
||||
Rem Euch, this is the only way I can think of right now
|
||||
Rem to copy them to the same directory. Daft but...
|
||||
erase %TEMP%\temp.zip
|
||||
zip16 -r %TEMP%\temp.zip *.exe
|
||||
unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\VC6Release
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
|
||||
cd %WXDIR%\demos
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
nmake -f makefile.vc FINAL=1
|
||||
Rem Copy all executables to VC6Release
|
||||
erase %TEMP%\temp.zip
|
||||
zip16 -r %TEMP%\temp.zip *.exe
|
||||
unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\VC6Release
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
|
||||
Rem Compile OGL
|
||||
cd %WXDIR%\contrib\src\ogl
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
nmake -f makefile.vc FINAL=1
|
||||
cd %WXDIR%\contrib\samples\ogl\ogledit
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
nmake -f makefile.vc FINAL=1
|
||||
copy *.exe %BUILDDEST%\VC6Release
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
cd %WXDIR%\contrib\samples\ogl\studio
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
nmake -f makefile.vc FINAL=1
|
||||
copy *.exe %BUILDDEST%\VC6Release
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
cd %WXDIR%\contrib\src\ogl
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
|
||||
Rem Compile Dialog Editor
|
||||
cd %WXDIR%\utils\dialoged\src
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
nmake -f makefile.vc FINAL=1
|
||||
copy *.exe %BUILDDEST%\VC6Release
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
|
||||
Rem Compile Tex2RTF
|
||||
cd %WXDIR%\utils\tex2rtf\src
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
nmake -f makefile.vc FINAL=1
|
||||
copy *.exe %BUILDDEST%\VC6Release
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
|
||||
Rem Clean up
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
nmake -f makefile.vc cleanall FINAL=1
|
||||
|
||||
echo *** VC++ Debug DLL ***
|
||||
|
||||
nmake -f makefile.vc cleanall WXMAKINGDLL=1
|
||||
nmake -f makefile.vc dll pch
|
||||
|
||||
if not direxist %BUILDDEST%\VC6DebugDLL mkdir /S %BUILDDEST%\VC6DebugDLL
|
||||
erase /F /Y %BUILDDEST%\VC6DebugDLL
|
||||
|
||||
copy %WXDIR%\lib\*d.dll %BUILDDEST%\VC6DebugDLL
|
||||
|
||||
Rem Make one sample, for a sanity check
|
||||
|
||||
cd %WXDIR%\samples\controls
|
||||
nmake -f makefile.vc WXUSINGDLL=1
|
||||
copy controls.exe %BUILDDEST%\VC6DebugDLL
|
||||
nmake -f makefile.vc clean
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
nmake -f makefile.vc cleanall WXMAKINGDLL=1
|
||||
|
||||
echo *** VC++ Release DLL ***
|
||||
|
||||
nmake -f makefile.vc cleanall FINAL=1 WXMAKINGDLL=1
|
||||
nmake -f makefile.vc dll pch FINAL=1
|
||||
|
||||
if not direxist %BUILDDEST%\VC6ReleaseDLL mkdir /S %BUILDDEST%\VC6ReleaseDLL
|
||||
erase /F /Y %BUILDDEST%\VC6ReleaseDLL
|
||||
|
||||
copy %WXDIR%\lib\*.dll %BUILDDEST%\VC6ReleaseDLL
|
||||
|
||||
Rem Make one sample, for a sanity check
|
||||
|
||||
cd %WXDIR%\samples\controls
|
||||
nmake -f makefile.vc WXUSINGDLL=1 FINAL=1
|
||||
copy controls.exe %BUILDDEST%\VC6ReleaseDLL
|
||||
nmake -f makefile.vc clean FINAL=1
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
nmake -f makefile.vc cleanall WXMAKINGDLL=1 FINAL=1
|
||||
|
||||
if "%CARRYON" == "0" goto end
|
||||
|
||||
:dobc55
|
||||
|
||||
echo === BC++ 5.5 ===
|
||||
echo ================
|
||||
|
||||
call bcb55
|
||||
|
||||
echo *** WIN32 BC++ Debug ***
|
||||
|
||||
Rem WIN32 BC++ Debug
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.b32 cleanall
|
||||
make -f makefile.b32
|
||||
if not direxist %BUILDDEST%\BC55Debug mkdir /S %BUILDDEST%\BC55Debug
|
||||
erase /F /Y %BUILDDEST%\BC55Debug
|
||||
cd %WXDIR%\samples
|
||||
make -f makefile.b32 clean
|
||||
|
||||
Rem Make one sample, just to make sure Debug mode is OK
|
||||
cd %WXDIR%\samples\controls
|
||||
make -f makefile.b32
|
||||
copy controls.exe %BUILDDEST%\BC55Debug
|
||||
make -f makefile.b32 clean
|
||||
|
||||
Rem Compile OGL
|
||||
cd %WXDIR%\contrib\src\ogl
|
||||
make -f makefile.b32 clean
|
||||
make -f makefile.b32
|
||||
cd %WXDIR%\contrib\samples\ogl\ogledit
|
||||
make -f makefile.b32 clean
|
||||
make -f makefile.b32
|
||||
copy *.exe %BUILDDEST%\BC55Debug
|
||||
make -f makefile.b32 clean
|
||||
cd %WXDIR%\contrib\samples\ogl\studio
|
||||
make -f makefile.b32 clean
|
||||
make -f makefile.b32
|
||||
copy *.exe %BUILDDEST%\BC55Debug
|
||||
make -f makefile.b32 clean
|
||||
cd %WXDIR%\contrib\src\ogl
|
||||
make -f makefile.b32 clean
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.b32 cleanall
|
||||
|
||||
goto bcdebugdll
|
||||
|
||||
echo *** WIN32 BC++ Release ***
|
||||
|
||||
make -f makefile.b32 cleanall FINAL=1
|
||||
make -f makefile.b32 FINAL=1
|
||||
|
||||
if not direxist %BUILDDEST%\BC55Release mkdir /S %BUILDDEST%\BC55Release
|
||||
erase /F /Y %BUILDDEST%\BC55Release
|
||||
|
||||
cd %WXDIR%\samples
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
make -f makefile.b32 FINAL=1
|
||||
Rem Copy all executables to BC55Release
|
||||
erase %TEMP%\temp.zip
|
||||
zip16 -r %TEMP%\temp.zip *.exe
|
||||
unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\BC55Release
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
|
||||
cd %WXDIR%\demos
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
make -f makefile.b32 FINAL=1
|
||||
Rem Copy all executables to BC55Release
|
||||
erase %TEMP%\temp.zip
|
||||
zip16 -r %TEMP%\temp.zip *.exe
|
||||
unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\BC55Release
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
|
||||
Rem Compile OGL
|
||||
cd %WXDIR%\contrib\src\ogl
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
make -f makefile.b32 FINAL=1
|
||||
cd %WXDIR%\contrib\samples\ogl\ogledit
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
make -f makefile.b32 FINAL=1
|
||||
copy *.exe %BUILDDEST%\BC55Release
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
cd %WXDIR%\contrib\samples\ogl\studio
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
make -f makefile.b32 FINAL=1
|
||||
copy *.exe %BUILDDEST%\BC55Release
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
cd %WXDIR%\contrib\src\ogl
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
|
||||
Rem Compile Dialog Editor
|
||||
cd %WXDIR%\utils\dialoged\src
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
make -f makefile.b32 FINAL=1
|
||||
copy *.exe %BUILDDEST%\BC55Release
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
|
||||
Rem Compile Tex2RTF
|
||||
cd %WXDIR%\utils\tex2rtf\src
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
make -f makefile.b32 FINAL=1
|
||||
copy *.exe %BUILDDEST%\BC55Release
|
||||
make -f makefile.b32 clean FINAL=1
|
||||
|
||||
Rem Clean up
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.b32 cleanall FINAL=1
|
||||
|
||||
:bcdebugdll
|
||||
|
||||
echo *** WIN32 BC++ Debug DLL ***
|
||||
|
||||
make -f makefile.b32 cleanall
|
||||
make -f makefile.b32 dll
|
||||
|
||||
if not direxist %BUILDDEST%\BC55DebugDLL mkdir /S %BUILDDEST%\BC55DebugDLL
|
||||
erase /F /Y %BUILDDEST%\BC55DebugDLL
|
||||
|
||||
copy %WXDIR%\lib\*.dll %BUILDDEST%\BC55DebugDLL
|
||||
|
||||
Rem Make one sample, for a sanity check
|
||||
|
||||
cd %WXDIR%\samples\controls
|
||||
make -f makefile.b32 WXUSINGDLL=1
|
||||
copy controls.exe %BUILDDEST%\BC55DebugDLL
|
||||
make -f makefile.b32 clean
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.b32 cleanall
|
||||
|
||||
if "%CARRYON" == "0" goto end
|
||||
|
||||
Rem Skip BC++ 5.0, obsolete
|
||||
goto docygwin11
|
||||
:dobc50
|
||||
|
||||
|
||||
echo === BC++ 5.0 ===
|
||||
echo ================
|
||||
|
||||
call borland
|
||||
|
||||
echo *** WIN32 BC++ Debug ***
|
||||
|
||||
Rem WIN32 BC++ Debug
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.b32 cleanall
|
||||
make -f makefile.b32
|
||||
if not direxist %BUILDDEST%\BC50Debug mkdir /S %BUILDDEST%\BC50Debug
|
||||
erase /F /Y %BUILDDEST%\BC50Debug
|
||||
cd %WXDIR%\samples
|
||||
make -f makefile.b32 clean
|
||||
|
||||
Rem Make one sample, just to make sure Debug mode is OK
|
||||
cd %WXDIR%\samples\controls
|
||||
make -f makefile.b32
|
||||
copy controls.exe %BUILDDEST%\BC50Debug
|
||||
make -f makefile.b32 clean
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.b32 cleanall
|
||||
|
||||
if "%CARRYON" == "0" goto end
|
||||
|
||||
:docygwin11
|
||||
|
||||
|
||||
echo === Cygwin 1.1 ===
|
||||
echo ==================
|
||||
|
||||
call cygwin11
|
||||
|
||||
echo *** Cygwin Debug ***
|
||||
|
||||
Rem Cygwin Release
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.g95 cleanall
|
||||
make -f makefile.g95 FINAL=1
|
||||
if not direxist %BUILDDEST%\Cygwin11Release mkdir /S %BUILDDEST%\Cygwin11Release
|
||||
erase /F /Y %BUILDDEST%\Cygwin11Release
|
||||
cd %WXDIR%\samples
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
|
||||
if not direxist %BUILDDEST%\Cygwin11Release mkdir /S %BUILDDEST%\Cygwin11Release
|
||||
erase /F /Y %BUILDDEST%\Cygwin11Release
|
||||
|
||||
cd %WXDIR%\samples
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
Rem Copy all executables to Cygwin11Release
|
||||
erase %TEMP%\temp.zip
|
||||
zip16 -r %TEMP%\temp.zip *.exe
|
||||
unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
|
||||
cd %WXDIR%\demos
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
Rem Copy all executables to Cygwin11Release
|
||||
erase %TEMP%\temp.zip
|
||||
zip16 -r %TEMP%\temp.zip *.exe
|
||||
unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
|
||||
Rem Compile OGL
|
||||
cd %WXDIR%\contrib\src\ogl
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
cd %WXDIR%\contrib\samples\ogl\ogledit
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
copy *.exe %BUILDDEST%\Cygwin11Release
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
cd %WXDIR%\contrib\samples\ogl\studio
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
copy *.exe %BUILDDEST%\Cygwin11Release
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
cd %WXDIR%\contrib\src\ogl
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
|
||||
Rem Compile Dialog Editor
|
||||
cd %WXDIR%\utils\dialoged\src
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
copy *.exe %BUILDDEST%\Cygwin11Release
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
|
||||
Rem Compile Tex2RTF
|
||||
cd %WXDIR%\utils\tex2rtf\src
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
copy *.exe %BUILDDEST%\Cygwin11Release
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
|
||||
echo Stripping executables...
|
||||
strip %BUILDDEST%\Cygwin11Release\*.exe
|
||||
|
||||
Rem Cleanup
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.g95 cleanall
|
||||
|
||||
if "%CARRYON" == "0" goto end
|
||||
|
||||
:doming2952
|
||||
|
||||
echo === Mingw32 2.95.2 ===
|
||||
echo ======================
|
||||
|
||||
call ming2952
|
||||
|
||||
echo *** Cygwin Debug ***
|
||||
|
||||
Rem Cygwin Release
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.g95 cleanall
|
||||
make -f makefile.g95 FINAL=1
|
||||
if not direxist %BUILDDEST%\Ming2952Release mkdir /S %BUILDDEST%\Ming2952Release
|
||||
erase /F /Y %BUILDDEST%\Ming2952Release
|
||||
cd %WXDIR%\samples
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
|
||||
if not direxist %BUILDDEST%\Ming2952Release mkdir /S %BUILDDEST%\Ming2952Release
|
||||
erase /F /Y %BUILDDEST%\Ming2952Release
|
||||
|
||||
cd %WXDIR%\samples
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
Rem Copy all executables to Ming2952Release
|
||||
erase %TEMP%\temp.zip
|
||||
zip16 -r %TEMP%\temp.zip *.exe
|
||||
unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
|
||||
cd %WXDIR%\demos
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
Rem Copy all executables to Ming2952Release
|
||||
erase %TEMP%\temp.zip
|
||||
zip16 -r %TEMP%\temp.zip *.exe
|
||||
unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
|
||||
Rem Compile OGL
|
||||
cd %WXDIR%\contrib\src\ogl
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
cd %WXDIR%\contrib\samples\ogl\ogledit
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
copy *.exe %BUILDDEST%\Ming2952Release
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
cd %WXDIR%\contrib\samples\ogl\studio
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
copy *.exe %BUILDDEST%\Ming2952Release
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
cd %WXDIR%\contrib\src\ogl
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
|
||||
Rem Compile Dialog Editor
|
||||
cd %WXDIR%\utils\dialoged\src
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
copy *.exe %BUILDDEST%\Ming2952Release
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
|
||||
Rem Compile Tex2RTF
|
||||
cd %WXDIR%\utils\tex2rtf\src
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
make -f makefile.g95 FINAL=1
|
||||
copy *.exe %BUILDDEST%\Ming2952Release
|
||||
make -f makefile.g95 clean FINAL=1
|
||||
|
||||
echo Stripping executables...
|
||||
strip %BUILDDEST%\Ming2952Release\*.exe
|
||||
|
||||
Rem Cleanup
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.g95 cleanall
|
||||
|
||||
if "%CARRYON" == "0" goto end
|
||||
|
||||
:dovc1
|
||||
|
||||
echo === 16-bit VC++ ===
|
||||
echo ===================
|
||||
|
||||
Rem Set up the environment
|
||||
call msvc1
|
||||
|
||||
Rem Needs full wxWindows path for making libraries
|
||||
set WXWIN=%FULLWXWIN%
|
||||
|
||||
echo *** VC++ Debug ***
|
||||
Rem VC++ Debug
|
||||
cd %WXDIR%\src\msw
|
||||
nmake -f makefile.dos cleanall
|
||||
nmake -f makefile.dos
|
||||
if not direxist %BUILDDEST%\VC1Debug mkdir /S %BUILDDEST%\VC1Debug
|
||||
erase /F /Y %BUILDDEST%\VC1Debug
|
||||
|
||||
Rem Make one sample, just to make sure Debug mode is OK
|
||||
cd %WXDIR%\samples\minimal
|
||||
nmake -f makefile.dos clean
|
||||
Rem Needs FAT wxWindows path for making executables
|
||||
set WXWIN=%FATWXWIN%
|
||||
nmake -f makefile.dos
|
||||
|
||||
copy minimal.exe /S %BUILDDEST%\VC1Debug
|
||||
nmake -f makefile.dos clean
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
nmake -f makefile.dos cleanall
|
||||
|
||||
Rem Needs full wxWindows path for making libraries
|
||||
set WXWIN=%FULLWXWIN%
|
||||
|
||||
echo *** VC++ Release ***
|
||||
|
||||
nmake -f makefile.dos cleanall FINAL=1
|
||||
nmake -f makefile.dos FINAL=1
|
||||
|
||||
if not direxist %BUILDDEST%\VC1Release mkdir /S %BUILDDEST%\VC1Release
|
||||
erase /F /Y %BUILDDEST%\VC1Release
|
||||
|
||||
Rem Make one sample, just to make sure Release mode is OK
|
||||
cd %WXDIR%\samples\minimal
|
||||
nmake -f makefile.dos clean
|
||||
nmake -f makefile.dos FINAL=1
|
||||
Rem Needs FAT wxWindows path for making executables
|
||||
set WXWIN=%FATWXWIN%
|
||||
nmake -f makefile.dos FINAL=1
|
||||
copy minimal.exe /S %BUILDDEST%\VC1Release
|
||||
nmake -f makefile.dos clean
|
||||
set WXWIN=%tmpwxwin%
|
||||
|
||||
Rem Clean up
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
nmake -f makefile.dos cleanall FINAL=1
|
||||
|
||||
if "%CARRYON" == "0" goto end
|
||||
|
||||
:dobc16
|
||||
|
||||
echo === 16-bit BC++ ===
|
||||
echo ===================
|
||||
|
||||
Rem Set up the environment
|
||||
call borland
|
||||
|
||||
echo *** 16-bit BC++ Debug ***
|
||||
Rem 16-bit BC++ Debug
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.bcc cleanall
|
||||
make -f makefile.bcc
|
||||
if not direxist %BUILDDEST%\BC16Debug mkdir /S %BUILDDEST%\BC16Debug
|
||||
erase /F /Y %BUILDDEST%\BC16Debug
|
||||
|
||||
Rem Make one sample, just to make sure Debug mode is OK
|
||||
cd %WXDIR%\samples\minimal
|
||||
make -f makefile.bcc clean
|
||||
make -f makefile.bcc
|
||||
copy minimal.exe /S %BUILDDEST%\BC16Debug
|
||||
make -f makefile.bcc clean
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.bcc cleanall
|
||||
|
||||
echo *** 16-bit BC++ Release ***
|
||||
|
||||
make -f makefile.bcc cleanall FINAL=1
|
||||
make -f makefile.bcc FINAL=1
|
||||
|
||||
if not direxist %BUILDDEST%\BC16Release mkdir /S %BUILDDEST%\BC16Release
|
||||
erase /F /Y %BUILDDEST%\BC16Release
|
||||
|
||||
Rem Make one sample, just to make sure Release mode is OK
|
||||
cd %WXDIR%\samples\minimal
|
||||
make -f makefile.bcc clean
|
||||
make -f makefile.bcc FINAL=1
|
||||
copy minimal.exe /S %BUILDDEST%\BC16Release
|
||||
make -f makefile.bcc clean
|
||||
|
||||
Rem Clean up
|
||||
|
||||
cd %WXDIR%\src\msw
|
||||
make -f makefile.bcc cleanall FINAL=1
|
||||
|
||||
:end
|
||||
|
||||
echo Finished wxWindows build at %_TIME, %_DATE
|
||||
|
||||
@ -259,7 +259,6 @@ dialog resource, translating the controls into wxWindows controls (Windows only)
|
||||
<li><a href="../../samples/oleauto">oleauto</a>: a little OLE automation controller (Windows only; requires
|
||||
Excel to be present).
|
||||
<li><a href="../../samples/ownerdrw">ownerdrw</a>: demonstrates owner-draw menus and controls (Windows only).
|
||||
<li><a href="../../samples/plot">plot</a>: demonstrates wxPlot classes (under development).
|
||||
<li><a href="../../samples/png">png</a>: demonstrates PNG loading.
|
||||
<li><a href="../../samples/printing">printing</a>: shows printing and previewing.
|
||||
<li><a href="../../samples/proplist">proplist</a>: demonstrates the property list classes (a VB-style property editor).
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
%\special{!/@scaleunit 1 def}
|
||||
\parskip=10pt
|
||||
\parindent=0pt
|
||||
\title{wxWindows 2.2: A portable C++ and Python GUI toolkit}
|
||||
\title{wxWindows 2.3: A portable C++ and Python GUI toolkit}
|
||||
\winhelponly{\author{by Julian Smart et al
|
||||
%\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
|
||||
}}
|
||||
\winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
|
||||
Robin Dunn, et al}
|
||||
\date{July 9th 2000}
|
||||
\date{May 25th 2001}
|
||||
}
|
||||
\makeindex
|
||||
\begin{document}
|
||||
|
||||
@ -435,18 +435,6 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "PlotVC"=.\plot\PlotVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "PngVC"=.\png\PngVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
|
||||
@ -112,8 +112,6 @@ all:
|
||||
make -f makefile.b32 FINAL=$(FINAL)
|
||||
cd $(WXDIR)\samples\png
|
||||
make -f makefile.b32 FINAL=$(FINAL)
|
||||
cd $(WXDIR)\samples\plot
|
||||
make -f makefile.b32 FINAL=$(FINAL)
|
||||
cd $(WXDIR)\samples\printing
|
||||
make -f makefile.b32 FINAL=$(FINAL)
|
||||
cd $(WXDIR)\samples\proplist
|
||||
@ -232,8 +230,6 @@ clean:
|
||||
make -f makefile.b32 clean
|
||||
cd $(WXDIR)\samples\png
|
||||
make -f makefile.b32 clean
|
||||
cd $(WXDIR)\samples\plot
|
||||
make -f makefile.b32 clean
|
||||
cd $(WXDIR)\samples\printing
|
||||
make -f makefile.b32 clean
|
||||
cd $(WXDIR)\samples\proplist
|
||||
|
||||
@ -56,7 +56,6 @@ all clean:
|
||||
-$(MAKE) -C notebook -f $(MAKEFILE) $@
|
||||
-$(MAKE) -C oleauto -f $(MAKEFILE) $@
|
||||
-$(MAKE) -C ownerdrw -f $(MAKEFILE) $@
|
||||
-$(MAKE) -C plot -f $(MAKEFILE) $@
|
||||
-$(MAKE) -C png -f $(MAKEFILE) $@
|
||||
-$(MAKE) -C printing -f $(MAKEFILE) $@
|
||||
-$(MAKE) -C proplist -f $(MAKEFILE) $@
|
||||
|
||||
@ -114,8 +114,6 @@ all:
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
cd $(WXDIR)\samples\png
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
cd $(WXDIR)\samples\plot
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
cd $(WXDIR)\samples\printing
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
cd $(WXDIR)\samples\proplist
|
||||
@ -234,8 +232,6 @@ clean:
|
||||
nmake -f makefile.vc clean
|
||||
cd $(WXDIR)\samples\png
|
||||
nmake -f makefile.vc clean
|
||||
cd $(WXDIR)\samples\plot
|
||||
nmake -f makefile.vc clean
|
||||
cd $(WXDIR)\samples\printing
|
||||
nmake -f makefile.vc clean
|
||||
cd $(WXDIR)\samples\proplist
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
#include "wx/fs_mem.h"
|
||||
#include "wx/mstream.h"
|
||||
|
||||
|
||||
class MemFSHashObj : public wxObject
|
||||
{
|
||||
public:
|
||||
|
||||
@ -212,8 +212,10 @@ bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint&
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#endif
|
||||
return FALSE;
|
||||
#else
|
||||
return FALSE;
|
||||
#endif
|
||||
}
|
||||
|
||||
void wxHtmlHelpController::SetFrameParameters(const wxString& title,
|
||||
|
||||
@ -16,7 +16,7 @@ SYSDEPMEM= $D\jmemnobs.obj
|
||||
# miscellaneous OS-dependent stuff
|
||||
# file deletion command
|
||||
!if "$(RM)" == ""
|
||||
RM= del
|
||||
RM= erase
|
||||
!endif
|
||||
|
||||
# End of configurable options.
|
||||
|
||||
@ -1103,6 +1103,10 @@ SOURCE=.\msw\textctrl.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\msw\tglbtn.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\msw\thread.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -1101,6 +1101,10 @@ SOURCE=.\msw\textctrl.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\msw\tglbtn.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\msw\thread.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
Loading…
Reference in New Issue
Block a user