Commit Graph

55 Commits

Author SHA1 Message Date
Mattia Barbon
77e0239d76 Patch [ 726877 ]: Remove /GX- from makevc.env
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-25 20:42:25 +00:00
Mattia Barbon
fb5230de74 Removed some superflous #defines already added by plaform.h, simplified a bit
the logic to construct directory and library names; now it should be possible
to build in Unicode mode without changing setup.h; fixed building wxBase with
makefiles.
  Added a new DEBUGINFO parameter. FINAL=hybrid DEBUGINFO=1 is like
FINAL=hybrid but with debug information.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-07 15:48:41 +00:00
Vadim Zeitlin
34b6a45ab9 centralize version info in one file, include it from all makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-24 23:20:22 +00:00
Vadim Zeitlin
817f640621 use jast major.minor, not major.minor.micro, in the DLL names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-24 00:33:28 +00:00
Julian Smart
c31752dadf Updated version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 11:08:08 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
David Webster
841346f01f removed ctl3d32.lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-11 13:44:31 +00:00
Robin Dunn
d440a0e764 Changed slightly the meaning of the Hybrid build. It is now
essentially a release build (no debug info, optimiztions turned on)
with the addition of __WXDEBUG__ being defined.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-25 01:43:22 +00:00
Robin Dunn
2417bf69de Set flags and libs for using unicows if MSLU=1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-30 01:18:03 +00:00
George Tasker
b311dc08be dummy(dll).obj is now created in wxWin/$D rather than wxWin/src/msw/$D
makefile.vc and makebase.vc no longer override the location of dummy(dll).obj that is specified in makevc.env
if wxWin/include/wx/msw/setup.h does not exist, setup0.h is copied to setup.h
[BASE builds]setup.h is no longer used from wxWin/include/wx, it is now used just like with makefile.vc.  setup.h is copied from wxWin/include/wx/msw into wxWin/lib/base(d)/wx and all references to setup.h now read this location


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-15 20:32:23 +00:00
Robin Dunn
ff06420077 Updated DLL version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-06 01:41:55 +00:00
George Tasker
3a7bfa067e Changes to make commandline compilation with VC6 match the same settings and LIB names as created with the VC IDE.
LIB/PCH/PDB files are now created in the same directories (off the wxWin dir) that the IDE uses


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-30 12:51:29 +00:00
George Tasker
4de853984d Added -DSTRICT to the WINFLAGS variable to match the new project settings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-19 13:20:07 +00:00
Mattia Barbon
b3bd664a90 Updated makefile.g95/vc to behave similarly to wxWindows.dsp WRT library names
and setup.h .


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-18 21:05:20 +00:00
Vadim Zeitlin
08e0d1cc8b changes for building wxRegEx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:35:05 +00:00
Julian Smart
9806a0e71e Updated version to 2.3.2 so apps can test for differences in new merged source
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 20:36:30 +00:00
Robin Dunn
014e19de74 Updated version numbers to 2.3.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-06 16:50:48 +00:00
Václav Slavík
ea39b21033 switched to new XPM code in wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-08 22:29:49 +00:00
George Tasker
a701b7f87e $(EXTRAINC) moved to the beginning of INC= line so that if a user wants to override the location of include directories with their own, it is possible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 10:39:01 +00:00
George Tasker
0548ca8d43 Additions to support the building of wxBase(d).lib from the command line with VC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 21:50:41 +00:00
George Tasker
0580ae4b9b Changed code to use the RM environment variable (if one exists) to delete files. If one does not exist, the ERASE command is used which is what was used previously
Target added for building .OBJ files for .C files in DEBUG or RELEASE subdirs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 10:59:36 +00:00
Robin Dunn
f641dada64 Changed version number in DLL name to 23_0
Added a new value for the FINAL flag to make another kind of wxPython
build possible


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-10-31 23:12:24 +00:00
Julian Smart
1126585b76 Corrected makefile target bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-26 11:53:38 +00:00
Julian Smart
df801fc6d4 Added additional wxXML makefiles and projects files; added some
flexibility to VC++ make include files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-26 11:43:54 +00:00
Julian Smart
4567f2b2c6 Updated project and makefiles (VC++) to be more consistent.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-23 14:26:37 +00:00
Bryan Petty
f6bcfd974e merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
Julian Smart
fbdcff4a78 Misc fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-05-05 16:40:32 +00:00
Julian Smart
669f7a111f Various compiler changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-15 18:52:23 +00:00
Julian Smart
5fa399c9e2 Made VC++ makefiles and project files a bit more consistent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-08 08:32:31 +00:00
Robin Dunn
0ad07724bf incremented version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-16 06:14:22 +00:00
Robin Dunn
a4bde64fd2 set version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-01 19:35:14 +00:00
Robin Dunn
9e0c3ef2c3 incremented version number for DLL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-10 22:59:20 +00:00
Robin Dunn
b49576e077 Linking with the TIFF library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-23 20:13:49 +00:00
Robin Dunn
b4d1ebf058 Took out somebody's hard coded path (j:\dev\something...) and put back
$(WXWIN).  Please just set an environment variable like the rest of us!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-16 21:00:59 +00:00
David Webster
97507ccea7 gdiimage updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-15 06:02:30 +00:00
Robin Dunn
8a28f119c8 Sombody committed this with a hard-coded pathname for WXDIR. Fixed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-08 07:10:11 +00:00
David Webster
5d4b632ba3 OS/2 PM Fixeups for fonts, validators, and html
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-08 05:20:31 +00:00
Robin Dunn
feef75abca Incremented the version number used in the DLL filename to match version.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-05 18:47:26 +00:00
Julian Smart
af111fc338 Removed lots of wxMotif compile warnings. Copied new install.txt into old
install.txt (wxMotif).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-26 13:33:13 +00:00
David Webster
50c375d311 *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-26 04:38:15 +00:00
Julian Smart
ac0ac8241f Fixed wxSlider95 bug; updated .dsp files; added Set/GetLastDirectory to wxDocManager
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-19 22:18:32 +00:00
Robin Dunn
7bf5436263 Allow override of /MDd
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-06 19:09:07 +00:00
Unknown (JL)
aee3892569 Debug version with compiler switch /MDd
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-05 06:40:42 +00:00
Robin Dunn
d6d2b6ae8f Inceremented the version number for the DLL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-05 06:32:15 +00:00
Julian Smart
1b9315eb77 Misc changes, including to wxPropertyForm and sample to make it work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-09-29 15:55:50 +00:00
Robin Dunn
aa855f21a8 updated version number for DLL name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-09-02 05:39:56 +00:00
Robin Dunn
cb1b6606ab Set the version number to use for the DLL in WXVERSION
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-04 16:33:27 +00:00
Robin Dunn
a4fe652485 Added $(NEW_WXLIBNAME) to allow changing the library or DLL name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-04-29 15:57:41 +00:00
Robin Dunn
e12f91dc2b Added $(WAITFLAG) so other shells can use appropriate flag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-04-12 01:30:01 +00:00
Julian Smart
e9c4b1a2b5 JPEG and PNG code taken out of image.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-04-06 13:44:37 +00:00