Misc release-related mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
@@ -41,7 +41,7 @@ RSC=rc.exe
|
|||||||
# PROP Intermediate_Dir "Release"
|
# PROP Intermediate_Dir "Release"
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
# 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" /I "d:\libxml\libxml2-2.1.1" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "expat/xmlparse" /I "expat/xmltok" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||||
# SUBTRACT CPP /YX
|
# SUBTRACT CPP /YX
|
||||||
# ADD BASE RSC /l 0x809
|
# ADD BASE RSC /l 0x809
|
||||||
# ADD RSC /l 0x809
|
# ADD RSC /l 0x809
|
||||||
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
|
|||||||
# PROP Intermediate_Dir "Debug"
|
# PROP Intermediate_Dir "Debug"
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
# 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" /I "d:\libxml\libxml2-2.1.1" /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
|
# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "expat/xmlparse" /I "expat/xmltok" /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
|
# SUBTRACT CPP /YX
|
||||||
# ADD BASE RSC /l 0x809
|
# ADD BASE RSC /l 0x809
|
||||||
# ADD RSC /l 0x809
|
# ADD RSC /l 0x809
|
||||||
@@ -82,12 +82,40 @@ LIB32=link.exe -lib
|
|||||||
|
|
||||||
# Name "wxXMLVC - Win32 Release"
|
# Name "wxXMLVC - Win32 Release"
|
||||||
# Name "wxXMLVC - Win32 Debug"
|
# Name "wxXMLVC - Win32 Debug"
|
||||||
|
# Begin Group "Expat"
|
||||||
|
|
||||||
|
# PROP Default_Filter ""
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\expat\xmlparse\xmlparse.c
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\expat\xmltok\xmlrole.c
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\expat\xmltok\xmltok.c
|
||||||
|
# End Source File
|
||||||
|
# End Group
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\xh_bmp.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\xh_bmpbt.cpp
|
||||||
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\xh_bttn.cpp
|
SOURCE=.\xh_bttn.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\xh_cald.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\xh_chckb.cpp
|
SOURCE=.\xh_chckb.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
@@ -108,6 +136,10 @@ SOURCE=.\xh_dlg.cpp
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\xh_frame.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\xh_gauge.cpp
|
SOURCE=.\xh_gauge.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
@@ -116,6 +148,14 @@ SOURCE=.\xh_html.cpp
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\xh_listb.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\xh_listc.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\xh_menu.cpp
|
SOURCE=.\xh_menu.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
@@ -136,6 +176,10 @@ SOURCE=.\xh_radbx.cpp
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\xh_scrol.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\xh_sizer.cpp
|
SOURCE=.\xh_sizer.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
@@ -152,6 +196,14 @@ SOURCE=.\xh_stbmp.cpp
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\xh_stbox.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\xh_stlin.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\xh_sttxt.cpp
|
SOURCE=.\xh_sttxt.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
@@ -160,11 +212,15 @@ SOURCE=.\xh_text.cpp
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\xh_listb.cpp
|
SOURCE=.\xh_toolb.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\xh_toolb.cpp
|
SOURCE=.\xh_tree.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\xh_unkwn.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
@@ -180,7 +236,7 @@ SOURCE=.\xmlbinz.cpp
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\xmlpars.cpp
|
SOURCE=.\xmlexpat.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
@@ -188,43 +244,11 @@ SOURCE=.\xmlres.cpp
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\xh_bmpbt.cpp
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xh_cald.cpp
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xh_listc.cpp
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xh_scrol.cpp
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xh_stbox.cpp
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xh_tree.cpp
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xh_stlin.cpp
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xh_bmp.cpp
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xh_unkwn.cpp
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xmlrsall.cpp
|
SOURCE=.\xmlrsall.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\xmlwrite.cpp
|
||||||
|
# End Source File
|
||||||
# End Target
|
# End Target
|
||||||
# End Project
|
# End Project
|
||||||
|
|||||||
@@ -72,7 +72,8 @@ LINK32=link.exe
|
|||||||
# PROP Ignore_Export_Lib 0
|
# PROP Ignore_Export_Lib 0
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
# 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 /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 /Gm /GX /ZI /Od /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 /Yc /Yu
|
||||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||||
# ADD 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 BASE RSC /l 0x809 /d "_DEBUG"
|
||||||
@@ -98,7 +99,8 @@ LINK32=link.exe
|
|||||||
# PROP Ignore_Export_Lib 0
|
# PROP Ignore_Export_Lib 0
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
# 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 /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 /YX"wxprec.h" /FD /c
|
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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 /FD /c
|
||||||
|
# SUBTRACT CPP /YX
|
||||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||||
# ADD 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 BASE RSC /l 0x809 /d "_DEBUG"
|
||||||
@@ -147,14 +149,6 @@ LINK32=link.exe
|
|||||||
# Name "ConvertVC - Win32 Release DLL"
|
# Name "ConvertVC - Win32 Release DLL"
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\wx\msw\blank.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\bullseye.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\convert.cpp
|
SOURCE=.\convert.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
@@ -163,50 +157,6 @@ SOURCE=.\convert.h
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\wx\msw\error.ico
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\hand.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\info.ico
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\magnif1.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\noentry.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\pbrush.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\pencil.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\pntleft.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\pntright.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\query.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\question.ico
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\rc2wxr.cpp
|
SOURCE=.\rc2wxr.cpp
|
||||||
|
|
||||||
!IF "$(CFG)" == "ConvertVC - Win32 Release"
|
!IF "$(CFG)" == "ConvertVC - Win32 Release"
|
||||||
@@ -255,26 +205,6 @@ SOURCE=.\rc2xml.h
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\wx\msw\roller.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\size.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\tip.ico
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\warning.ico
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wx\msw\watch1.cur
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\wxconvert.rc
|
SOURCE=.\wxconvert.rc
|
||||||
# ADD BASE RSC /l 0x809
|
# ADD BASE RSC /l 0x809
|
||||||
# ADD RSC /l 0x809
|
# ADD RSC /l 0x809
|
||||||
|
|||||||
29
contrib/utils/convertrc/ConvertVC.dsw
Normal file
29
contrib/utils/convertrc/ConvertVC.dsw
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||||
|
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
Project: "ConvertVC"=.\ConvertVC.dsp - Package Owner=<4>
|
||||||
|
|
||||||
|
Package=<5>
|
||||||
|
{{{
|
||||||
|
}}}
|
||||||
|
|
||||||
|
Package=<4>
|
||||||
|
{{{
|
||||||
|
}}}
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
Global:
|
||||||
|
|
||||||
|
Package=<5>
|
||||||
|
{{{
|
||||||
|
}}}
|
||||||
|
|
||||||
|
Package=<3>
|
||||||
|
{{{
|
||||||
|
}}}
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
@@ -82,7 +82,6 @@ USE_CTL3D=1
|
|||||||
|
|
||||||
!if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
|
!if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
|
||||||
USE_CTL3D=0
|
USE_CTL3D=0
|
||||||
USE_XPM_IN_MSW=0
|
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
PERIPH_LIBS=
|
PERIPH_LIBS=
|
||||||
@@ -117,9 +116,6 @@ MSWOBJS1 = #$ ExpandList("WXMSWOBJS1");
|
|||||||
|
|
||||||
MSWOBJS2 = #$ ExpandList("WXMSWOBJS2");
|
MSWOBJS2 = #$ ExpandList("WXMSWOBJS2");
|
||||||
|
|
||||||
# TODO: Implement XPM and PNG targets in this makefile!
|
|
||||||
# $(OLEDIR)\pnghand \
|
|
||||||
|
|
||||||
OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
|
OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
|
||||||
|
|
||||||
# Normal, static library
|
# Normal, static library
|
||||||
|
|||||||
@@ -20,9 +20,6 @@ src/zlib/ZlibVC.dsw
|
|||||||
src/png/PngVC.dsp
|
src/png/PngVC.dsp
|
||||||
src/png/PngVC.dsw
|
src/png/PngVC.dsw
|
||||||
|
|
||||||
src/xpm/XpmVC.dsp
|
|
||||||
src/xpm/XpmVC.dsw
|
|
||||||
|
|
||||||
samples/SamplesVC.dsw
|
samples/SamplesVC.dsw
|
||||||
|
|
||||||
samples/calendar/CalendarVC.dsp
|
samples/calendar/CalendarVC.dsp
|
||||||
|
|||||||
@@ -25,15 +25,20 @@ pause
|
|||||||
|
|
||||||
erase %dest\wx*.zip
|
erase %dest\wx*.zip
|
||||||
erase %dest\*.htb
|
erase %dest\*.htb
|
||||||
erase %dest\ogl3.zip
|
erase %dest\ogl3*.zip
|
||||||
erase %dest\contrib.zip
|
erase %dest\contrib*.zip
|
||||||
erase %dest\tex2rtf2.zip
|
erase %dest\tex2rtf2*.zip
|
||||||
erase %dest\jpeg.zip
|
erase %dest\mmedia*.zip
|
||||||
erase %dest\tiff.zip
|
erase %dest\jpeg*.zip
|
||||||
erase %dest\dialoged.zip
|
erase %dest\tiff*.zip
|
||||||
erase %dest\utils.zip
|
erase %dest\dialoged*.zip
|
||||||
erase %dest\extradoc.zip
|
erase %dest\utils*.zip
|
||||||
erase %dest\*-win32.zip
|
erase %dest\extradoc*.zip
|
||||||
|
erase %dest\stc*.zip
|
||||||
|
erase %dest\*-win32*.zip
|
||||||
|
erase %dest\setup*.*
|
||||||
|
erase %dest\*.txt
|
||||||
|
erase %dest\make*
|
||||||
|
|
||||||
if direxist %dest\wx erase /sxyz %dest\wx\
|
if direxist %dest\wx erase /sxyz %dest\wx\
|
||||||
if not direxist %dest mkdir %dest
|
if not direxist %dest mkdir %dest
|
||||||
@@ -50,8 +55,20 @@ Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\wx_chm.rsp
|
|||||||
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\jpeg.rsp
|
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\jpeg.rsp
|
||||||
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\tiff.rsp
|
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\tiff.rsp
|
||||||
|
|
||||||
|
echo Zipping wxMac distribution
|
||||||
|
zip32 -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
|
||||||
|
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
|
||||||
|
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw.rsp
|
||||||
|
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tiff.rsp
|
||||||
|
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\jpeg.rsp
|
||||||
|
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
|
||||||
|
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\dialoged.rsp
|
||||||
|
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\ogl.rsp
|
||||||
|
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp
|
||||||
|
|
||||||
Rem Below is the old-style separated-out format. This is retained only
|
Rem Below is the old-style separated-out format. This is retained only
|
||||||
Rem for local use, and for creating wxMSW-xxx.zip.
|
Rem for local use, and for creating wxMSW-xxx.zip.
|
||||||
|
echo Zipping individual components
|
||||||
zip32 -@ %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\generic.rsp
|
zip32 -@ %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\generic.rsp
|
||||||
zip32 -@ -u %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\makefile.rsp
|
zip32 -@ -u %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\makefile.rsp
|
||||||
zip32 -@ %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\msw.rsp
|
zip32 -@ %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\msw.rsp
|
||||||
@@ -73,7 +90,7 @@ zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
|
|||||||
|
|
||||||
Rem PDF/HTML docs that should go into the Windows setup because
|
Rem PDF/HTML docs that should go into the Windows setup because
|
||||||
Rem there are no WinHelp equivalents
|
Rem there are no WinHelp equivalents
|
||||||
zip32 -@ %dest\extradoc.zip < %src\distrib\msw\extradoc.rsp
|
zip32 -@ %dest\extradoc-%version%.zip < %src\distrib\msw\extradoc.rsp
|
||||||
|
|
||||||
rem VC++ project files
|
rem VC++ project files
|
||||||
zip32 -@ %dest\wxWindows-%version%-vc.zip < %src\distrib\msw\vc.rsp
|
zip32 -@ %dest\wxWindows-%version%-vc.zip < %src\distrib\msw\vc.rsp
|
||||||
@@ -85,51 +102,53 @@ rem CodeWarrior project files
|
|||||||
zip32 -@ %dest\wxWindows-%version%-cw.zip < %src\distrib\msw\cw.rsp
|
zip32 -@ %dest\wxWindows-%version%-cw.zip < %src\distrib\msw\cw.rsp
|
||||||
|
|
||||||
rem OGL 3
|
rem OGL 3
|
||||||
zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp
|
zip32 -@ %dest\ogl3-%version%.zip < %src\distrib\msw\ogl.rsp
|
||||||
|
|
||||||
rem MMedia
|
rem MMedia
|
||||||
zip32 -@ %dest\mmedia.zip < %src\distrib\msw\mmedia.rsp
|
zip32 -@ %dest\mmedia-%version%.zip < %src\distrib\msw\mmedia.rsp
|
||||||
|
|
||||||
rem STC (Scintilla widget)
|
rem STC (Scintilla widget)
|
||||||
zip32 -@ %dest\stc.zip < %src\distrib\msw\stc.rsp
|
zip32 -@ %dest\stc-%version%.zip < %src\distrib\msw\stc.rsp
|
||||||
|
|
||||||
rem GLCanvas: obsolete, now in main library
|
rem GLCanvas: obsolete, now in main library
|
||||||
rem zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.rsp
|
rem zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.rsp
|
||||||
|
|
||||||
rem Tex2RTF
|
rem Tex2RTF
|
||||||
zip32 -@ %dest\tex2rtf2.zip < %src\distrib\msw\tex2rtf.rsp
|
zip32 -@ %dest\tex2rtf2-%version%.zip < %src\distrib\msw\tex2rtf.rsp
|
||||||
|
|
||||||
rem JPEG source
|
rem JPEG source
|
||||||
zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
|
zip32 -@ %dest\jpeg-%version%.zip < %src\distrib\msw\jpeg.rsp
|
||||||
|
|
||||||
rem TIFF source
|
rem TIFF source
|
||||||
zip32 -@ %dest\tiff.zip < %src\distrib\msw\tiff.rsp
|
zip32 -@ %dest\tiff-%version%.zip < %src\distrib\msw\tiff.rsp
|
||||||
|
|
||||||
zip32 -@ %dest\wxxml.zip < %src\distrib\msw\xml.rsp
|
zip32 -@ %dest\wxxml-%version%.zip < %src\distrib\msw\xml.rsp
|
||||||
|
|
||||||
zip32 -@ %dest\contrib.zip < %src\distrib\msw\contrib.rsp
|
zip32 -@ %dest\contrib-%version%.zip < %src\distrib\msw\contrib.rsp
|
||||||
|
|
||||||
rem Dialog Editor source and binary
|
rem Dialog Editor source and binary
|
||||||
erase %dest\dialoged_source.zip
|
erase %dest\dialoged_source.zip
|
||||||
zip32 -@ %dest\dialoged_source.zip < %src\distrib\msw\dialoged.rsp
|
zip32 -@ %dest\dialoged_source.zip < %src\distrib\msw\dialoged.rsp
|
||||||
zip32 -j %dest\dialoged.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
|
zip32 -j %dest\dialoged-%version%.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
|
||||||
erase %dest\dialoged_source.zip
|
erase %dest\dialoged_source.zip
|
||||||
|
|
||||||
rem Misc. utils not in the main distribution
|
rem Misc. utils not in the main distribution
|
||||||
zip32 -@ %dest\utils.zip < %src\distrib\msw\utils.rsp
|
zip32 -@ %dest\utils-%version%.zip < %src\distrib\msw\utils.rsp
|
||||||
zip32 -@ -u %dest\utils.zip < %src\distrib\msw\utilmake.rsp
|
zip32 -@ -u %dest\utils-%version%.zip < %src\distrib\msw\utilmake.rsp
|
||||||
|
|
||||||
copy %src\docs\changes.txt %dest
|
copy %src\docs\changes.txt %dest\changes-%version%.txt
|
||||||
copy %src\docs\msw\install.txt %dest\install_msw.txt
|
copy %src\docs\msw\install.txt %dest\install_msw-%version%.txt
|
||||||
copy %src\docs\motif\install.txt %dest\install_motif.txt
|
copy %src\docs\mac\install.txt %dest\install_mac-%version%.txt
|
||||||
copy %src\docs\gtk\install.txt %dest\install_gtk.txt
|
copy %src\docs\motif\install.txt %dest\install_motif-%version%.txt
|
||||||
copy %src\docs\readme.txt %dest
|
copy %src\docs\gtk\install.txt %dest\install_gtk-%version%.txt
|
||||||
|
copy %src\docs\readme.txt %dest\readme-%version%.txt
|
||||||
copy %src\docs\motif\readme.txt %dest\readme_motif.txt
|
copy %src\docs\motif\readme.txt %dest\readme_motif.txt
|
||||||
copy %src\docs\gtk\readme.txt %dest\readme_gtk.txt
|
copy %src\docs\gtk\readme.txt %dest\readme_gtk-%version%.txt
|
||||||
copy %src\docs\msw\readme.txt %dest\readme_msw.txt
|
copy %src\docs\msw\readme.txt %dest\readme_msw-%version%.txt
|
||||||
copy %src\docs\readme_vms.txt %dest
|
copy %src\docs\mac\readme.txt %dest\readme_mac-%version%.txt
|
||||||
copy %src\docs\motif\makewxmotif %dest
|
copy %src\docs\readme_vms.txt %dest\readme_vms-%version%.txt
|
||||||
copy %src\docs\gtk\makewxgtk %dest
|
copy %src\docs\motif\makewxmotif %dest\makewxmotif-%version%
|
||||||
|
copy %src\docs\gtk\makewxgtk %dest\makewxgtk-%version%
|
||||||
|
|
||||||
Rem Skip Inno Setup if inno is 0.
|
Rem Skip Inno Setup if inno is 0.
|
||||||
if "%inno" == "0" goto end
|
if "%inno" == "0" goto end
|
||||||
@@ -140,8 +159,8 @@ Rem Make dialoged-win32.zip and tex2rtf-win32.zip
|
|||||||
|
|
||||||
cd %src\bin
|
cd %src\bin
|
||||||
|
|
||||||
zip32 %dest\dialoged-win32.zip dialoged.*
|
zip32 %dest\dialoged-win32-%version%.zip dialoged.*
|
||||||
zip32 %dest\tex2rtf-win32.zip tex2rtf.*
|
zip32 %dest\tex2rtf-win32-%version%.zip tex2rtf.*
|
||||||
|
|
||||||
cd %dest
|
cd %dest
|
||||||
|
|
||||||
@@ -157,15 +176,15 @@ unzip32 -o ..\wxWindows-%version%-gen.zip
|
|||||||
unzip32 -o ..\wxWindows-%version%-vc.zip
|
unzip32 -o ..\wxWindows-%version%-vc.zip
|
||||||
unzip32 -o ..\wxWindows-%version%-bc.zip
|
unzip32 -o ..\wxWindows-%version%-bc.zip
|
||||||
unzip32 -o ..\wxWindows-%version%-HTMLHelp.zip
|
unzip32 -o ..\wxWindows-%version%-HTMLHelp.zip
|
||||||
unzip32 -o ..\extradoc.zip
|
unzip32 -o ..\extradoc-%version%.zip
|
||||||
Rem Need Word file, for Remstar DB classes
|
Rem Need Word file, for Remstar DB classes
|
||||||
unzip32 -o ..\wxWindows-%version%-Word.zip
|
unzip32 -o ..\wxWindows-%version%-Word.zip
|
||||||
unzip32 -o ..\ogl3.zip
|
unzip32 -o ..\ogl3-%version%.zip
|
||||||
unzip32 -o ..\jpeg.zip
|
unzip32 -o ..\jpeg-%version%.zip
|
||||||
unzip32 -o ..\tiff.zip
|
unzip32 -o ..\tiff-%version%.zip
|
||||||
unzip32 -o ..\xml.zip
|
unzip32 -o ..\wxxml-%version%.zip
|
||||||
unzip32 -o ..\contrib.zip
|
unzip32 -o ..\contrib-%version%.zip
|
||||||
unzip32 -o ..\tex2rtf2.zip
|
unzip32 -o ..\tex2rtf2-%version%.zip
|
||||||
|
|
||||||
rem Now delete a few files that are unnecessary
|
rem Now delete a few files that are unnecessary
|
||||||
attrib -R *
|
attrib -R *
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ Installing wxWindows 2.3
|
|||||||
------------------------
|
------------------------
|
||||||
|
|
||||||
This is wxWindows 2.3 for Microsoft Windows 3.1, 95, 98 and
|
This is wxWindows 2.3 for Microsoft Windows 3.1, 95, 98 and
|
||||||
Windows NT/Windows 2000. This is an official, stable release.
|
Windows NT/Windows 2000. This is an unstable development release.
|
||||||
|
|
||||||
IMPORTANT NOTE: If you experience problems installing, please
|
IMPORTANT NOTE: If you experience problems installing, please
|
||||||
re-read this instructions and other related files (changes.txt,
|
re-read this instructions and other related files (changes.txt,
|
||||||
|
|||||||
@@ -1,22 +1,27 @@
|
|||||||
wxWindows 2.3.0
|
wxWindows 2.3.0
|
||||||
---------------
|
---------------
|
||||||
|
|
||||||
|
*** Please note that this is an UNSTABLE DEVELOPMENT SNAPSHOT.
|
||||||
|
*** Unless you need the new features and bug fixes, you may wish to
|
||||||
|
*** use the official 2.2.x stable series.
|
||||||
|
|
||||||
Welcome to wxWindows 2, a sophisticated cross-platform C++
|
Welcome to wxWindows 2, a sophisticated cross-platform C++
|
||||||
framework for writing advanced GUI applications using (where
|
framework for writing advanced GUI applications using (where
|
||||||
possible) the native controls.
|
possible) the native controls.
|
||||||
|
|
||||||
In addition to common and advanced GUI facilities such as frames, scrolling
|
In addition to common and advanced GUI facilities such as
|
||||||
windows, toolbars, tree controls, icons, device contexts, printing,
|
frames, scrolling windows, toolbars, tree controls, icons,
|
||||||
splitter windows and so on, there are wrappers for common file operations,
|
device contexts, printing, splitter windows and so on, there are
|
||||||
and facilities for writing TCP/IP applications, thread handling, and more.
|
wrappers for common file operations, and facilities for writing
|
||||||
Where certain features are not available on a platform, such as MDI and
|
TCP/IP applications, thread handling, and more. Where certain
|
||||||
tree controls on Unix, they are emulated.
|
features are not available on a platform, such as MDI and tree
|
||||||
|
controls on Unix, they are emulated.
|
||||||
|
|
||||||
A detailed 1400-page reference manual is supplied in HTML, PDF and
|
A detailed 1400-page reference manual is supplied in HTML, PDF
|
||||||
Windows Help form: see the docs hierarchy.
|
and Windows Help form: see the docs hierarchy.
|
||||||
|
|
||||||
For a quick start, point your Web browser at docs/html/index.htm for a
|
For a quick start, point your Web browser at docs/html/index.htm
|
||||||
list of important documents and samples.
|
for a list of important documents and samples.
|
||||||
|
|
||||||
Changes in this release
|
Changes in this release
|
||||||
-----------------------
|
-----------------------
|
||||||
@@ -28,7 +33,7 @@ Platforms supported
|
|||||||
|
|
||||||
wxWindows 2 currently supports the following platforms:
|
wxWindows 2 currently supports the following platforms:
|
||||||
|
|
||||||
- Windows 3.1, Windows 95/98, Windows NT
|
- Windows 3.1, Windows 95/98, Windows NT, Windows 2000
|
||||||
- Most Unix variants with Motif/Lesstif
|
- Most Unix variants with Motif/Lesstif
|
||||||
- Most Unix variants with GTK+
|
- Most Unix variants with GTK+
|
||||||
- MacOS
|
- MacOS
|
||||||
@@ -212,5 +217,5 @@ web site.
|
|||||||
|
|
||||||
Good luck!
|
Good luck!
|
||||||
|
|
||||||
The wxWindows Team, 8th May, 2001
|
The wxWindows Team, 12th May, 2001
|
||||||
|
|
||||||
|
|||||||
@@ -293,7 +293,7 @@ bool wxBitmap::CreateFromXpm(const char **data)
|
|||||||
wxImage img = decoder.ReadData(data);
|
wxImage img = decoder.ReadData(data);
|
||||||
wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
|
wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
|
||||||
|
|
||||||
*this = wxBitmap(img);
|
*this = img.ConvertToBitmap();
|
||||||
return TRUE;
|
return TRUE;
|
||||||
#else
|
#else
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ WXBUILDDLL=1
|
|||||||
# Please set these according to the settings in wx_setup.h, so we can include
|
# Please set these according to the settings in wx_setup.h, so we can include
|
||||||
# the appropriate libraries in wx.lib
|
# the appropriate libraries in wx.lib
|
||||||
USE_CTL3D=0
|
USE_CTL3D=0
|
||||||
USE_XPM_IN_MSW=1
|
|
||||||
|
|
||||||
PERIPH_LIBS=
|
PERIPH_LIBS=
|
||||||
PERIPH_TARGET=
|
PERIPH_TARGET=
|
||||||
@@ -50,13 +49,6 @@ PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
|
|||||||
PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
|
PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
!if "$(USE_XPM_IN_MSW)" == "1"
|
|
||||||
PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
|
|
||||||
PERIPH_TARGET=xpm $(PERIPH_TARGET)
|
|
||||||
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
|
|
||||||
!endif
|
|
||||||
|
|
||||||
#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
|
|
||||||
PERIPH_LIBS=
|
PERIPH_LIBS=
|
||||||
PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
|
PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
|
||||||
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET)
|
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET)
|
||||||
@@ -65,7 +57,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TA
|
|||||||
DUMMY=dummy
|
DUMMY=dummy
|
||||||
!else
|
!else
|
||||||
DUMMY=dummydll
|
DUMMY=dummydll
|
||||||
LIBS= cw32mti import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
|
LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
LIBTARGET=$(WXLIB)
|
LIBTARGET=$(WXLIB)
|
||||||
@@ -943,16 +935,6 @@ all_execs:
|
|||||||
make -f makefile.b32 all_execs
|
make -f makefile.b32 all_execs
|
||||||
cd $(WXDIR)\src\msw
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
wxxpm: $(CFG)
|
|
||||||
cd $(WXDIR)\src\xpm
|
|
||||||
make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
|
|
||||||
cd $(WXDIR)\src\msw
|
|
||||||
|
|
||||||
clean_wxxpm: $(CFG)
|
|
||||||
cd $(WXDIR)\src\xpm
|
|
||||||
make -f makefile.b32 clean
|
|
||||||
cd $(WXDIR)\src\msw
|
|
||||||
|
|
||||||
png: $(CFG)
|
png: $(CFG)
|
||||||
cd $(WXDIR)\src\png
|
cd $(WXDIR)\src\png
|
||||||
make -f makefile.b32
|
make -f makefile.b32
|
||||||
@@ -983,16 +965,6 @@ clean_jpeg:
|
|||||||
make -f makefile.b32 clean
|
make -f makefile.b32 clean
|
||||||
cd $(WXDIR)\src\msw
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
xpm: $(CFG)
|
|
||||||
cd $(WXDIR)\src\xpm
|
|
||||||
make -f makefile.b32 lib
|
|
||||||
cd $(WXDIR)\src\msw
|
|
||||||
|
|
||||||
clean_xpm:
|
|
||||||
cd $(WXDIR)\src\xpm
|
|
||||||
make -f makefile.b32 clean
|
|
||||||
cd $(WXDIR)\src\msw
|
|
||||||
|
|
||||||
tiff: $(CFG)
|
tiff: $(CFG)
|
||||||
cd $(WXDIR)\src\tiff
|
cd $(WXDIR)\src\tiff
|
||||||
make -f makefile.b32 lib
|
make -f makefile.b32 lib
|
||||||
@@ -1018,7 +990,7 @@ $(CFG): makefile.b32
|
|||||||
-WE
|
-WE
|
||||||
-tWM
|
-tWM
|
||||||
|
|
||||||
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
|
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
|
||||||
-I$(WXDIR)\include\wx\msw\gnuwin32
|
-I$(WXDIR)\include\wx\msw\gnuwin32
|
||||||
|
|
||||||
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
|
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ THISDIR = $(WXDIR)\src\msw
|
|||||||
# Please set these according to the settings in wx_setup.h, so we can include
|
# Please set these according to the settings in wx_setup.h, so we can include
|
||||||
# the appropriate libraries in wx.lib
|
# the appropriate libraries in wx.lib
|
||||||
USE_CTL3D=1
|
USE_CTL3D=1
|
||||||
USE_XPM_IN_MSW=1
|
|
||||||
|
|
||||||
PERIPH_LIBS=
|
PERIPH_LIBS=
|
||||||
PERIPH_TARGET=
|
PERIPH_TARGET=
|
||||||
@@ -50,12 +49,6 @@ PERIPH_CLEAN_TARGET=
|
|||||||
PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
|
PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
!if "$(USE_XPM_IN_MSW)" == "1"
|
|
||||||
PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
|
|
||||||
PERIPH_TARGET=xpm $(PERIPH_TARGET)
|
|
||||||
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
|
|
||||||
!endif
|
|
||||||
|
|
||||||
# TODO: add these libraries
|
# TODO: add these libraries
|
||||||
# PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
|
# PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
|
||||||
PERIPH_TARGET=zlib png $(PERIPH_TARGET)
|
PERIPH_TARGET=zlib png $(PERIPH_TARGET)
|
||||||
@@ -748,16 +741,6 @@ all_execs:
|
|||||||
cd $(WXDIR)\src\msw
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
# CONTRIB
|
# CONTRIB
|
||||||
xpm: $(CFG)
|
|
||||||
cd $(WXDIR)\src\xpm
|
|
||||||
make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
|
|
||||||
cd $(WXDIR)\src\msw
|
|
||||||
|
|
||||||
clean_xpm: $(CFG)
|
|
||||||
cd $(WXDIR)\src\xpm
|
|
||||||
make -f makefile.bcc clean
|
|
||||||
cd $(WXDIR)\src\msw
|
|
||||||
|
|
||||||
png: $(CFG)
|
png: $(CFG)
|
||||||
cd $(WXDIR)\src\png
|
cd $(WXDIR)\src\png
|
||||||
make -f makefile.bcc
|
make -f makefile.bcc
|
||||||
@@ -795,7 +778,7 @@ $(CFG): makefile.bcc
|
|||||||
-Fs-
|
-Fs-
|
||||||
-Vf
|
-Vf
|
||||||
-Ff=4
|
-Ff=4
|
||||||
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
|
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib
|
||||||
-I$(WXDIR)\include\wx\msw\gnuwin32
|
-I$(WXDIR)\include\wx\msw\gnuwin32
|
||||||
-L$(BCCDIR)\lib
|
-L$(BCCDIR)\lib
|
||||||
-D__WXWIN__
|
-D__WXWIN__
|
||||||
|
|||||||
@@ -26,12 +26,10 @@ DUMMYOBJ=dummy.obj
|
|||||||
# This one overrides the others, to be consistent with the settings in wx_setup.h
|
# This one overrides the others, to be consistent with the settings in wx_setup.h
|
||||||
MINIMAL_WXWINDOWS_SETUP=0
|
MINIMAL_WXWINDOWS_SETUP=0
|
||||||
|
|
||||||
USE_XPM_IN_MSW=1
|
|
||||||
USE_CTL3D=1
|
USE_CTL3D=1
|
||||||
|
|
||||||
!if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
|
!if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
|
||||||
USE_CTL3D=0
|
USE_CTL3D=0
|
||||||
USE_XPM_IN_MSW=0
|
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
PERIPH_LIBS=
|
PERIPH_LIBS=
|
||||||
@@ -42,12 +40,6 @@ PERIPH_CLEAN_TARGET=
|
|||||||
# PERIPH_LIBS=d:\msdev\lib\ctl3d32.lib $(PERIPH_LIBS)
|
# PERIPH_LIBS=d:\msdev\lib\ctl3d32.lib $(PERIPH_LIBS)
|
||||||
# !endif
|
# !endif
|
||||||
|
|
||||||
!if "$(USE_XPM_IN_MSW)" == "1"
|
|
||||||
PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
|
|
||||||
PERIPH_TARGET=xpm $(PERIPH_TARGET)
|
|
||||||
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
|
|
||||||
!endif
|
|
||||||
|
|
||||||
# PNG and Zlib
|
# PNG and Zlib
|
||||||
PERIPH_TARGET=png zlib $(PERIPH_TARGET)
|
PERIPH_TARGET=png zlib $(PERIPH_TARGET)
|
||||||
PERIPH_CLEAN_TARGET=clean_png clean_zlib $(PERIPH_CLEAN_TARGET)
|
PERIPH_CLEAN_TARGET=clean_png clean_zlib $(PERIPH_CLEAN_TARGET)
|
||||||
@@ -270,10 +262,6 @@ MSWOBJS2 = $(MSWDIR)\palette.obj \
|
|||||||
$(MSWDIR)\wave.obj \
|
$(MSWDIR)\wave.obj \
|
||||||
$(MSWDIR)\window.obj
|
$(MSWDIR)\window.obj
|
||||||
|
|
||||||
# TODO: Implement XPM and PNG targets in this makefile!
|
|
||||||
# $(OLEDIR)\xpmhand \
|
|
||||||
# $(OLEDIR)\pnghand \
|
|
||||||
|
|
||||||
OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
|
OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
|
||||||
|
|
||||||
# Normal, static library
|
# Normal, static library
|
||||||
@@ -1377,18 +1365,6 @@ $(OBJECTS): $(WXDIR)/include/wx/setup.h
|
|||||||
|
|
||||||
# Peripheral components
|
# Peripheral components
|
||||||
|
|
||||||
$(WXDIR)\lib\xpm.lib: xpm
|
|
||||||
|
|
||||||
xpm:
|
|
||||||
cd $(WXDIR)\src\xpm
|
|
||||||
nmake -f makefile.dos FINAL=$(FINAL)
|
|
||||||
cd $(WXDIR)\src\msw
|
|
||||||
|
|
||||||
clean_xpm:
|
|
||||||
cd $(WXDIR)\src\xpm
|
|
||||||
nmake -f makefile.dos clean
|
|
||||||
cd $(WXDIR)\src\msw
|
|
||||||
|
|
||||||
zlib:
|
zlib:
|
||||||
cd $(WXDIR)\src\zlib
|
cd $(WXDIR)\src\zlib
|
||||||
nmake -f makefile.dos FINAL=$(FINAL)
|
nmake -f makefile.dos FINAL=$(FINAL)
|
||||||
|
|||||||
Reference in New Issue
Block a user