Mercurial > forge
changeset 3050:827b56b174c8 octave-forge
Add compilation instructions for wxWidgets (required by gnuplot)
| author | goffioul |
|---|---|
| date | Sun, 04 Feb 2007 19:06:23 +0000 |
| parents | 71dd96d05da4 |
| children | c5bd47edc667 |
| files | admin/Windows/msvc/libs/wxwidgets-2.8.0.diff admin/Windows/msvc/libs/wxwidgets-2.8.0.txt |
| diffstat | 2 files changed, 86 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/admin/Windows/msvc/libs/wxwidgets-2.8.0.diff Sun Feb 04 19:06:23 2007 +0000 @@ -0,0 +1,68 @@ +diff -ur wxWidgets-orig/build/msw/config.vc wxWidgets/build/msw/config.vc +--- wxWidgets-orig/build/msw/config.vc 2006-11-06 16:53:16.000000000 +0100 ++++ wxWidgets/build/msw/config.vc 2007-02-04 10:55:52.250000000 +0100 +@@ -44,7 +44,7 @@ + MSLU = 0 + + # Type of compiled binaries [debug,release] +-BUILD = debug ++BUILD = release + + # The target processor architecture must be specified when it is not X86. + # This does not affect the compiler output, so you still need to make sure +@@ -69,7 +69,7 @@ + DEBUG_RUNTIME_LIBS = default + + # Multiple libraries or single huge monolithic one? [0,1] +-MONOLITHIC = 0 ++MONOLITHIC = 1 + + # Build GUI libraries? [0,1] + USE_GUI = 1 +diff -ur wxWidgets-orig/build/msw/makefile.vc wxWidgets/build/msw/makefile.vc +--- wxWidgets-orig/build/msw/makefile.vc 2006-12-11 14:43:50.000000000 +0100 ++++ wxWidgets/build/msw/makefile.vc 2007-02-03 20:44:54.843750000 +0100 +@@ -1324,7 +1324,7 @@ + __RUNTIME_LIBS_21 = $(__THREADSFLAG) + !endif + !if "$(USE_GUI)" == "1" +-__wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib ++__wxpng___depname = + !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_34 = D +@@ -1333,8 +1333,9 @@ + __RUNTIME_LIBS_34 = $(__THREADSFLAG) + !endif + !if "$(USE_GUI)" == "1" +-__wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib ++__wxjpeg___depname = + !endif ++__wxzlib___depname = + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_47 = D + !endif +@@ -3951,11 +3952,12 @@ + __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib + !endif + !if "$(USE_GUI)" == "1" +-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib ++__LIB_JPEG_p = jpeg.lib + !endif + !if "$(USE_GUI)" == "1" +-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib ++__LIB_PNG_p = png.lib + !endif ++__LIB_ZLIB_p = zlib.lib + !if "$(MSLU)" == "1" + __UNICOWS_LIB_p = unicows.lib + !endif +@@ -4069,7 +4071,7 @@ + + ### Targets: ### + +-all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file ++all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file + + clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/admin/Windows/msvc/libs/wxwidgets-2.8.0.txt Sun Feb 04 19:06:23 2007 +0000 @@ -0,0 +1,18 @@ +Package: wxWidgets +Version: 2.8.0 +Home page: http://www.wxwidgets.org +Download: http://www.wxwidgets.org/downloads/ +License: wxWindows (~LGPL) + +Compilation: from Windows command shell with VS environment + +Requirements: libpng, libjpeg, zlib + +1) Install the package and apply the patch + +2) Go into build\msw\ directory + +3) nmake -f makefile.vc + +Installation is not really required, as gnuplot compilation +will use wxWidgets from its source directory.