From: Robert Roebling Date: Fri, 13 Aug 1999 08:58:58 +0000 (+0000) Subject: Added WINE and probably x-compile makefiles X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e4b4d60e568af6b48054868ff85ee8ea59e9b0d8 Added WINE and probably x-compile makefiles Fixed busy cursor compilation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index 93fe99d4e7..7bd3fa7dea 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # -# This file was automatically generated by tmake at 19:46, 1999/08/12 +# This file was automatically generated by tmake at 09:43, 1999/08/13 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -97,6 +97,7 @@ JPEGDIR = $(WXDIR)/src/jpeg ZLIBDIR = $(WXDIR)/src/zlib GTKDIR = $(WXDIR)/src/gtk MOTIFDIR = $(WXDIR)/src/motif +MSWDIR = $(WXDIR)/src/msw INCDIR = $(WXDIR)/include DOCDIR = $(WXDIR)/docs @@ -789,6 +790,192 @@ MOTIF_GUIOBJS = \ src/motif/utils.o \ src/motif/window.o +MSW_GENERICOBJS = \ + src/generic/busyinfo.o \ + src/generic/choicdgg.o \ + src/generic/dirdlgg.o \ + src/generic/gridg.o \ + src/generic/laywin.o \ + src/generic/numdlgg.o \ + src/generic/panelg.o \ + src/generic/progdlgg.o \ + src/generic/prop.o \ + src/generic/propform.o \ + src/generic/proplist.o \ + src/generic/sashwin.o \ + src/generic/scrolwin.o \ + src/generic/splitter.o \ + src/generic/statusbr.o \ + src/generic/tabg.o \ + src/generic/textdlgg.o \ + src/generic/tipdlg.o + +MSW_COMMONOBJS = \ + src/common/choiccmn.o \ + src/common/cmndata.o \ + src/common/config.o \ + src/common/ctrlcmn.o \ + src/common/date.o \ + src/common/datstrm.o \ + src/common/db.o \ + src/common/dbtable.o \ + src/common/dcbase.o \ + src/common/dlgcmn.o \ + src/common/docmdi.o \ + src/common/docview.o \ + src/common/dynarray.o \ + src/common/dynlib.o \ + src/common/event.o \ + src/common/extended.o \ + src/common/ffile.o \ + src/common/file.o \ + src/common/fileconf.o \ + src/common/filefn.o \ + src/common/filesys.o \ + src/common/framecmn.o \ + src/common/fs_inet.o \ + src/common/fs_zip.o \ + src/common/ftp.o \ + src/common/gdicmn.o \ + src/common/hash.o \ + src/common/helpbase.o \ + src/common/http.o \ + src/common/imagbmp.o \ + src/common/image.o \ + src/common/imaggif.o \ + src/common/imagjpeg.o \ + src/common/imagpng.o \ + src/common/intl.o \ + src/common/ipcbase.o \ + src/common/layout.o \ + src/common/list.o \ + src/common/log.o \ + src/common/memory.o \ + src/common/mimetype.o \ + src/common/module.o \ + src/common/mstream.o \ + src/common/object.o \ + src/common/objstrm.o \ + src/common/paper.o \ + src/common/prntbase.o \ + src/common/process.o \ + src/common/protocol.o \ + src/common/resource.o \ + src/common/sckaddr.o \ + src/common/sckfile.o \ + src/common/sckipc.o \ + src/common/sckstrm.o \ + src/common/sizer.o \ + src/common/socket.o \ + src/common/strconv.o \ + src/common/stream.o \ + src/common/string.o \ + src/common/tbarbase.o \ + src/common/textcmn.o \ + src/common/textfile.o \ + src/common/time.o \ + src/common/timercmn.o \ + src/common/tokenzr.o \ + src/common/txtstrm.o \ + src/common/unzip.o \ + src/common/url.o \ + src/common/utilscmn.o \ + src/common/valgen.o \ + src/common/validate.o \ + src/common/valtext.o \ + src/common/variant.o \ + src/common/wfstream.o \ + src/common/wincmn.o \ + src/common/wxchar.o \ + src/common/wxexpr.o \ + src/common/zipstrm.o \ + src/common/zstream.o + +MSW_GUIOBJS = \ + src/msw/accel.o \ + src/msw/app.o \ + src/msw/bitmap.o \ + src/msw/bmpbuttn.o \ + src/msw/brush.o \ + src/msw/button.o \ + src/msw/caret.o \ + src/msw/checkbox.o \ + src/msw/checklst.o \ + src/msw/choice.o \ + src/msw/clipbrd.o \ + src/msw/colordlg.o \ + src/msw/colour.o \ + src/msw/combobox.o \ + src/msw/control.o \ + src/msw/curico.o \ + src/msw/cursor.o \ + src/msw/data.o \ + src/msw/dc.o \ + src/msw/dcclient.o \ + src/msw/dcmemory.o \ + src/msw/dcprint.o \ + src/msw/dcscreen.o \ + src/msw/dde.o \ + src/msw/dialog.o \ + src/msw/dib.o \ + src/msw/dibutils.o \ + src/msw/dragimag.o \ + src/msw/filedlg.o \ + src/msw/font.o \ + src/msw/fontdlg.o \ + src/msw/frame.o \ + src/msw/gauge95.o \ + src/msw/gdiobj.o \ + src/msw/helpwin.o \ + src/msw/icon.o \ + src/msw/imaglist.o \ + src/msw/joystick.o \ + src/msw/listbox.o \ + src/msw/listctrl.o \ + src/msw/main.o \ + src/msw/mdi.o \ + src/msw/menu.o \ + src/msw/menuitem.o \ + src/msw/metafile.o \ + src/msw/minifram.o \ + src/msw/msgdlg.o \ + src/msw/nativdlg.o \ + src/msw/notebook.o \ + src/msw/ownerdrw.o \ + src/msw/palette.o \ + src/msw/pen.o \ + src/msw/penwin.o \ + src/msw/pnghand.o \ + src/msw/printdlg.o \ + src/msw/printwin.o \ + src/msw/radiobox.o \ + src/msw/radiobut.o \ + src/msw/regconf.o \ + src/msw/region.o \ + src/msw/registry.o \ + src/msw/scrolbar.o \ + src/msw/settings.o \ + src/msw/slider95.o \ + src/msw/spinbutt.o \ + src/msw/statbmp.o \ + src/msw/statbox.o \ + src/msw/statbr95.o \ + src/msw/statline.o \ + src/msw/stattext.o \ + src/msw/tabctrl.o \ + src/msw/taskbar.o \ + src/msw/tbar95.o \ + src/msw/textctrl.o \ + src/msw/thread.o \ + src/msw/timer.o \ + src/msw/tooltip.o \ + src/msw/treectrl.o \ + src/msw/utils.o \ + src/msw/utilsexc.o \ + src/msw/wave.o \ + src/msw/window.o \ + src/msw/xpmhand.o + HTMLOBJS = \ src/html/htmlcell.o \ src/html/htmlfilter.o \ @@ -896,13 +1083,13 @@ JPEGOBJS = \ src/jpeg/jdmerge.o -OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(HTMLOBJS) $(UNIXOBJS) \ +OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \ $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \ $(GENERIC_HEADERS) $(WX_HEADERS) -REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif \ +REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif ./src/msw \ ./src/generic ./src/unix ./src/motif/xmombo ./src/html \ ./src/zlib ./src/jpeg ./src/png @@ -912,6 +1099,7 @@ $(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDI @if test ! -d ./lib; then mkdir ./lib; fi @if test ! -d ./src; then mkdir ./src; fi @if test ! -d ./src/common; then mkdir ./src/common; fi + @if test ! -d ./src/msw; then mkdir ./src/msw; fi @if test ! -d ./src/gtk; then mkdir ./src/gtk; fi @if test ! -d ./src/motif; then mkdir ./src/motif; fi @if test ! -d ./src/motif/xmcombo; then mkdir ./src/motif/xmcombo; fi @@ -983,6 +1171,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $( $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h @if test ! -d $(includedir)/wx; then mkdir $(includedir)/wx; fi + @if test ! -d $(includedir)/wx/msw; then mkdir $(includedir)/wx/msw; fi @if test ! -d $(includedir)/wx/gtk; then mkdir $(includedir)/wx/gtk; fi @if test ! -d $(includedir)/wx/motif; then mkdir $(includedir)/wx/motif; fi @if test ! -d $(includedir)/wx/html; then mkdir $(includedir)/wx/html; fi @@ -1031,6 +1220,7 @@ uninstall: @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi + @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/msw; fi @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi diff --git a/configure.in b/configure.in index 8726cdcf41..2bc4a2eb6d 100644 --- a/configure.in +++ b/configure.in @@ -1378,25 +1378,31 @@ WXGTK12= WXWINE= if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then - AC_MSG_CHECKING(for Windows headers) - WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" + AC_MSG_CHECKING(for Windows headers) + WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" - dnl --- Quick & Dirty ; link against most/all libraries - dnl --- This will bloat the executable, but it'll work for now... - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -loldnames -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" + dnl --- Quick & Dirty ; link against most/all libraries + dnl --- This will bloat the executable, but it'll work for now... + LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -loldnames -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" - if test "$ac_find_includes" != "" ; then - AC_MSG_RESULT(found $ac_find_includes) - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" - else - AC_MSG_RESULT(no) - if test "$cross_compiling" != "yes" ; then - AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) - fi - fi + if test "$ac_find_includes" != "" ; then + AC_MSG_RESULT(found $ac_find_includes) + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" + else + AC_MSG_RESULT(no) + if test "$cross_compiling" != "yes" ; then + AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) + fi + fi - TOOLKIT=MSW + TOOLKIT=MSW + + GUIOBJS=MSW_GUIOBJS + GUIHEADERS= + COMMONOBJS=MSW_COMMONOBJS + GENERICOBJS=MSW_GENERICOBJS + UNIXOBJS= fi if test "$wxUSE_GTK" = 1; then @@ -1415,6 +1421,7 @@ if test "$wxUSE_GTK" = 1; then GUIHEADERS=GTK_HEADERS COMMONOBJS=GTK_COMMONOBJS GENERICOBJS=GTK_GENERICOBJS + UNIXOBJS=UNIXOBJS fi if test "$wxUSE_WINE" = 1; then @@ -1456,6 +1463,12 @@ if test "$wxUSE_WINE" = 1; then GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" WXWINE=1 TOOLKIT=MSW + + GUIOBJS=MSW_GUIOBJS + GUIHEADERS= + COMMONOBJS=MSW_COMMONOBJS + GENERICOBJS=MSW_GENERICOBJS + UNIXOBJS=UNIXOBJS fi if test "$wxUSE_MOTIF" = 1; then @@ -1526,6 +1539,7 @@ if test "$wxUSE_MOTIF" = 1; then GUIHEADERS=MOTIF_HEADERS COMMONOBJS=MOTIF_COMMONOBJS GENERICOBJS=MOTIF_GENERICOBJS + UNIXOBJS=UNIXOBJS fi dnl the name of the directory where the files for this toolkit live @@ -1617,8 +1631,12 @@ case "${host}" in SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o" ;; *-*-cygwin32* ) + dnl only static for now + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" ;; *-*-mingw32* ) + dnl only static for now + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" ;; *-pc-os2_emx ) ;; @@ -2642,6 +2660,7 @@ AC_SUBST(GUIOBJS) AC_SUBST(GUIHEADERS) AC_SUBST(COMMONOBJS) AC_SUBST(GENERICOBJS) +AC_SUBST(UNIXOBJS) dnl additional subdirectories where we will build AC_SUBST(SRC_SUBDIRS) diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index 254576ad21..f5a7df684a 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -12,7 +12,19 @@ #! %wxCommon, %wxGeneric, %wxHtml, %wxUnix and %wxGTK hashes. IncludeTemplate("filelist.t"); - #! now transform these hashes into $project tags + #! Generic + + foreach $file (sort keys %wxGeneric) { + #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations, + #! so take the generic version + if ( $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/ ) { + next unless $file =~ /^dirdlgg\./; + } + + $file =~ s/cp?p?$/\o/; + $project{"WXMSW_GENERICOBJS"} .= "src/generic/" . $file . " " + } + foreach $file (sort keys %wxGeneric) { next if $wxGeneric{$file} =~ /\bR\b/; @@ -20,7 +32,6 @@ $project{"WXGTK_GENERICOBJS"} .= "src/generic/" . $file . " " } - #! now transform these hashes into $project tags foreach $file (sort keys %wxGeneric) { next if $wxCommon{$file} =~ /\bX\b/; @@ -28,6 +39,8 @@ $project{"WXMOTIF_GENERICOBJS"} .= "src/generic/" . $file . " " } + #! Common + foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\bR\b/; @@ -42,6 +55,30 @@ $project{"WXMOTIF_COMMONOBJS"} .= "src/common/" . $file . " " } + foreach $file (sort keys %wxCommon) { + next if $wxCommon{$file} =~ /\b(16)\b/; + + #! needs extra files (sql*.h) so not compiled by default. + next if $file =~ /^odbc\./; + + $file =~ s/cp?p?$/\o/; + $project{"WXMSW_COMMONOBJS"} .= "src/common/" . $file . " " + } + + #! GUI + + foreach $file (sort keys %wxMSW) { + #! Mingw32 doesn't have the OLE headers and has some troubles with + #! socket code + next if $wxMSW{$file} =~ /\b(O|16)\b/; + + #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations, + next if $file =~ /^dirdlg\./; + + $file =~ s/cp?p?$/\o/; + $project{"WXMSW_GUIOBJS"} .= "src/msw/" . $file . " " + } + foreach $file (sort keys %wxGTK) { $file =~ s/cp?p?$/\o/; $project{"WXGTK_GUIOBJS"} .= "src/gtk/" . $file . " " @@ -52,6 +89,8 @@ $project{"WXMOTIF_GUIOBJS"} .= "src/motif/" . $file . " " } + #! others + foreach $file (sort keys %wxHTML) { $file =~ s/cp?p?$/\o/; $project{"WXHTMLOBJS"} .= "src/html/" . $file . " " @@ -62,6 +101,8 @@ $project{"WXUNIXOBJS"} .= "src/unix/" . $file . " " } + #! headers + foreach $file (sort keys %wxWXINCLUDE) { $project{"WX_HEADERS"} .= $file . " " } @@ -188,6 +229,7 @@ JPEGDIR = $(WXDIR)/src/jpeg ZLIBDIR = $(WXDIR)/src/zlib GTKDIR = $(WXDIR)/src/gtk MOTIFDIR = $(WXDIR)/src/motif +MSWDIR = $(WXDIR)/src/msw INCDIR = $(WXDIR)/include DOCDIR = $(WXDIR)/docs @@ -236,6 +278,15 @@ MOTIF_GUIOBJS = \ src/motif/xmcombo/xmcombo.o \ #$ ExpandList("WXMOTIF_GUIOBJS"); +MSW_GENERICOBJS = \ + #$ ExpandList("WXMSW_GENERICOBJS"); + +MSW_COMMONOBJS = \ + #$ ExpandList("WXMSW_COMMONOBJS"); + +MSW_GUIOBJS = \ + #$ ExpandList("WXMSW_GUIOBJS"); + HTMLOBJS = \ #$ ExpandList("WXHTMLOBJS"); @@ -325,13 +376,13 @@ JPEGOBJS = \ src/jpeg/jdmerge.o -OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(HTMLOBJS) $(UNIXOBJS) \ +OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \ $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \ $(GENERIC_HEADERS) $(WX_HEADERS) -REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif \ +REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif ./src/msw \ ./src/generic ./src/unix ./src/motif/xmombo ./src/html \ ./src/zlib ./src/jpeg ./src/png @@ -341,6 +392,7 @@ $(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDI @if test ! -d ./lib; then mkdir ./lib; fi @if test ! -d ./src; then mkdir ./src; fi @if test ! -d ./src/common; then mkdir ./src/common; fi + @if test ! -d ./src/msw; then mkdir ./src/msw; fi @if test ! -d ./src/gtk; then mkdir ./src/gtk; fi @if test ! -d ./src/motif; then mkdir ./src/motif; fi @if test ! -d ./src/motif/xmcombo; then mkdir ./src/motif/xmcombo; fi @@ -412,6 +464,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $( $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h @if test ! -d $(includedir)/wx; then mkdir $(includedir)/wx; fi + @if test ! -d $(includedir)/wx/msw; then mkdir $(includedir)/wx/msw; fi @if test ! -d $(includedir)/wx/gtk; then mkdir $(includedir)/wx/gtk; fi @if test ! -d $(includedir)/wx/motif; then mkdir $(includedir)/wx/motif; fi @if test ! -d $(includedir)/wx/html; then mkdir $(includedir)/wx/html; fi @@ -460,6 +513,7 @@ uninstall: @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi + @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/msw; fi @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi diff --git a/include/wx/utils.h b/include/wx/utils.h index 1349c6dda2..368b6409bc 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -23,7 +23,6 @@ #include "wx/setup.h" #include "wx/object.h" #include "wx/list.h" -#include "wx/window.h" #include "wx/filefn.h" #ifdef __X__ @@ -39,6 +38,7 @@ class WXDLLEXPORT wxProcess; class WXDLLEXPORT wxFrame; +class WXDLLEXPORT wxWindow; // FIXME should use wxStricmp() instead #if defined(__GNUWIN32__)