From 6c8f8bc534ffd485c9755e2be4550fbc205b0f68 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Mon, 10 Jan 2000 17:11:19 +0000 Subject: [PATCH] SN: Fixes to OS/2 specific problems (use LEX_STEM and PATH_IFS set by configure). SN: Added support for compiling wxPM with EMX using Unix-Makefiles. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/filelist.t | 4 +++ distrib/msw/tmake/filelist.txt | 16 +++++---- distrib/msw/tmake/unx.t | 63 +++++++++++++++++++++++++++++++--- 3 files changed, 71 insertions(+), 12 deletions(-) diff --git a/distrib/msw/tmake/filelist.t b/distrib/msw/tmake/filelist.t index 18ce139b37..7cd700b24f 100644 --- a/distrib/msw/tmake/filelist.t +++ b/distrib/msw/tmake/filelist.t @@ -43,6 +43,8 @@ $wxMOTIF{$fields[0]} = $fields[2]; } elsif ( $fields[1] eq "R" ) { $wxGTK{$fields[0]} = $fields[2]; + } elsif ( $fields[1] eq "O" ) { + $wxOS2PM{$fields[0]} = $fields[2]; } elsif ( $fields[1] eq "H" ) { $wxHTML{$fields[0]} = $fields[2]; } elsif ( $fields[1] eq "U" ) { @@ -61,6 +63,8 @@ $wxMSWINCLUDE{$fields[0]} = $fields[2]; } elsif ( $fields[1] eq "K" ) { $wxGTKINCLUDE{$fields[0]} = $fields[2]; + } elsif ( $fields[1] eq "2" ) { + $wxOS2PMINCLUDE{$fields[0]} = $fields[2]; } elsif ( $fields[1] eq "S" ) { $wxUNIXINCLUDE{$fields[0]} = $fields[2]; } elsif ( $fields[1] eq "N" ) { diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index bbf5cc9e03..00ef75776c 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -41,6 +41,9 @@ # S Socket file (currently doesn't compile under Win16 nor with GNU) # R Not required for the GTK port # X Not required for the Motif port +# P Not required for the os2Pm port +# (unfortunately I can't use O since that is +# in use already - and above I can't use P :-( ) # # WX Base header # GTK GTK header @@ -62,9 +65,9 @@ caret.cpp G U choicdgg.cpp G colrdlgg.cpp G G dcpsg.cpp G U -dirdlgg.cpp G 16 -fontdlgg.cpp G G,R -filedlgg.cpp G U,X +dirdlgg.cpp G 16,P +fontdlgg.cpp G G,R,P +filedlgg.cpp G U,X,P grid.cpp G helpext.cpp G G helphtml.cpp G G @@ -75,7 +78,7 @@ laywin.cpp G listctrl.cpp G 16 logg.cpp G msgdlgg.cpp G G -notebook.cpp G 16,R +notebook.cpp G 16,R,P panelg.cpp G printps.cpp G PS prntdlgg.cpp G PS,U @@ -86,9 +89,9 @@ proplist.cpp G sashwin.cpp G scrolwin.cpp G splitter.cpp G -statline.cpp G U,R +statline.cpp G U,R,P statusbr.cpp G -tabg.cpp G 16 +tabg.cpp G 16,P numdlgg.cpp G tbarsmpl.cpp G textdlgg.cpp G @@ -995,7 +998,6 @@ settings.h 2 window.h 2 fontdlg.h 2 msgdlg.h 2 -setup.h 2 colour.h 2 frame.h 2 setup0.h 2 diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index 6101364805..4533c15d2a 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -8,7 +8,8 @@ #!################################################################################ #${ #! include the code which parses filelist.txt file and initializes - #! %wxCommon, %wxGeneric, %wxHtml, %wxUnix and %wxGTK hashes. + #! %wxCommon, %wxGeneric, %wxHtml, %wxUnix, %wxGTK, %wxMOTIF and + #! %wxOS2PM hashes. IncludeTemplate("filelist.t"); #! Generic @@ -39,6 +40,7 @@ } foreach $file (sort keys %wxGeneric) { + #! skip generic files not required for the wxMotif port next if $wxGeneric{$file} =~ /\bX\b/; $file2 = $file; @@ -48,6 +50,17 @@ $project{"WXMOTIF_GENERICDEPS"} .= $file2 . " " } + foreach $file (sort keys %wxGeneric) { + #! skip generic files not required for the wxPM port + next if $wxGeneric{$file} =~ /\bP\b/; + + $file2 = $file; + $file =~ s/cp?p?$/\o/; + $file2 =~ s/cp?p?$/\d/; + $project{"WXOS2PM_GENERICOBJS"} .= $file . " "; + $project{"WXOS2PM_GENERICDEPS"} .= $file2 . " " + } + #! Base foreach $file (sort keys %wxBase) { @@ -78,6 +91,10 @@ $project{"WXMOTIF_COMMONOBJS"} .= $fileobj . " "; $project{"WXMOTIF_COMMONDEPS"} .= $filedep . " " } + if ( $wxCommon{$file} !~ /\bP\b/ ) { #! unless not for OS2PM + $project{"WXOS2PM_COMMONOBJS"} .= $fileobj . " "; + $project{"WXOS2PM_COMMONDEPS"} .= $filedep . " "; + } #! ODBC needs extra files (sql*.h) so not compiled by default. if ( (file !~ /^odbc\./) && ($wxCommon{$file} !~ /\b(16)\b/) ) { @@ -119,6 +136,14 @@ $project{"WXMOTIF_GUIDEPS"} .= $file2 . " " } + foreach $file (sort keys %wxOS2PM) { + $file2 = $file; + $file =~ s/cp?p?$/\o/; + $file2 =~ s/cp?p?$/\d/; + $project{"WXOS2PM_GUIOBJS"} .= $file . " "; + $project{"WXOS2PM_GUIDEPS"} .= $file2 . " " + } + #! others foreach $file (sort keys %wxHTML) { @@ -161,11 +186,15 @@ foreach $file (sort keys %wxGTKINCLUDE) { $project{"WXGTK_HEADERS"} .= "gtk/" . $file . " " } + + foreach $file (sort keys %wxOS2PMINCLUDE) { + $project{"WXOS2PM_HEADERS"} .= "os2/" . $file . " " + } foreach $file (sort keys %wxMSWINCLUDE) { $project{"WXMSW_HEADERS"} .= "msw/" . $file . " " } - + foreach $file (sort keys %wxHTMLINCLUDE) { $project{"WXHTML_HEADERS"} .= "html/" . $file . " " } @@ -227,7 +256,7 @@ VP9 = @top_srcdir@/src/tiff VP10 = @top_srcdir@/src/zlib VP11 = @top_srcdir@/src/iodbc -VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10):$(VP11) +VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) top_srcdir = @top_srcdir@ prefix = @prefix@ @@ -294,6 +323,7 @@ ZLIBDIR = $(WXDIR)/src/zlib GTKDIR = $(WXDIR)/src/gtk MOTIFDIR = $(WXDIR)/src/motif MSWDIR = $(WXDIR)/src/msw +PMDIR = $(WXDIR)/src/os2 ODBCDIR = $(WXDIR)/src/iodbc INCDIR = $(WXDIR)/include SAMPDIR = $(WXDIR)/samples @@ -325,6 +355,9 @@ MOTIF_HEADERS = \ MSW_HEADERS = \ #$ ExpandList("WXMSW_HEADERS"); +PM_HEADERS = \ + #$ ExpandList("WXOS2PM_HEADERS"); + UNIX_HEADERS = \ #$ ExpandList("WXUNIX_HEADERS"); @@ -399,6 +432,26 @@ MSW_GUIOBJS = \ MSW_GUIDEPS = \ #$ ExpandList("WXMSW_GUIDEPS"); +PM_GENERICOBJS = \ + #$ ExpandList("WXOS2PM_GENERICOBJS"); + +PM_GENERICDEPS = \ + #$ ExpandList("WXOS2PM_GENERICDEPS"); + +PM_COMMONOBJS = \ + parser.o \ + #$ ExpandList("WXOS2PM_COMMONOBJS"); + +PM_COMMONDEPS = \ + parser.d \ + #$ ExpandList("WXOS2PM_COMMONDEPS"); + +PM_GUIOBJS = \ + #$ ExpandList("WXOS2PM_GUIOBJS"); + +PM_GUIDEPS = \ + #$ ExpandList("WXOS2PM_GUIDEPS"); + BASE_OBJS = \ #$ ExpandList("BASE_OBJS"); @@ -614,11 +667,11 @@ parser.c: $(COMMDIR)/parser.y lexer.c lexer.c: $(COMMDIR)/lexer.l $(LEX) $(COMMDIR)/lexer.l - @sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \ + @sed -e "s;$(COMMDIR)/@LEX_STEM@.c;lexer.l;g" < @LEX_STEM@.c | \ sed -e "s/yy/PROIO_yy/g" | \ sed -e "s/input/PROIO_input/g" | \ sed -e "s/unput/PROIO_unput/g" > lexer.c - @$(RM) lex.yy.c + @$(RM) @LEX_STEM@.c -include $(DEPFILES) -- 2.45.2