Added RTLD_GLOBAL to dlopen() flags which is needed if libraries depend

[wxWidgets.git] / distrib / msw / tmake / bcc.t

diff --git a/distrib/msw/tmake/bcc.t b/distrib/msw/tmake/bcc.t
index 3fe2a8915cd132bbb0692772667691aed05fb83f..e4683f6ecad254e39753a3a39d2cffe35334e09f 100644 (file)
--- a/distrib/msw/tmake/bcc.t
+++ b/distrib/msw/tmake/bcc.t
@@ -20,7 +20,10 @@
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
         my $tag = "";
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
         my $tag = "";

-        next if $wxGeneric{$file} =~ /\b(PS|G|U)\b/;
+        if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
+            #! Need this file too since it has wxGenericPageSetupDialog
+            next unless $file =~ /^prntdlgg\./;
+        }

 
         $file =~ s/cp?p?$/obj/;
         $project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
 
         $file =~ s/cp?p?$/obj/;
         $project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "


@@ -95,18 +98,18 @@ THISDIR = $(WXDIR)\src\msw
 # Please set these according to the settings in wx_setup.h, so we can include
 # the appropriate libraries in wx.lib
 USE_CTL3D=1
 # Please set these according to the settings in wx_setup.h, so we can include
 # the appropriate libraries in wx.lib
 USE_CTL3D=1

-USE_XPM_IN_MSW=0
+USE_XPM_IN_MSW=1

 
 PERIPH_LIBS=
 PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=
 
 !if "$(USE_CTL3D)" == "1"
 
 PERIPH_LIBS=
 PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=
 
 !if "$(USE_CTL3D)" == "1"

-PERIPH_LIBS=$(BCCDIR)\lib\ctl3dv2.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)

 !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"
 !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"

-PERIPH_LIBS=$(WXDIR)\xpm.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)

 PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
 PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif


@@ -144,7 +147,7 @@ wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
        erase $(LIBTARGET)
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
        erase $(LIBTARGET)

-       tlib $(LIBTARGET) /P1024 @&&!
+       tlib $(LIBTARGET) /P2048 @&&!

 +$(COMMONOBJS:.obj =.obj +)\
 +$(GENERICOBJS:.obj =.obj +)\
 +$(MSWOBJS:.obj =.obj +)\
 +$(COMMONOBJS:.obj =.obj +)\
 +$(GENERICOBJS:.obj =.obj +)\
 +$(MSWOBJS:.obj =.obj +)\


@@ -174,7 +177,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     foreach (@objs) {
         $text .= $_ . ": ";
         $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
     foreach (@objs) {
         $text .= $_ . ": ";
         $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';

-        s/obj/$suffix/;
+        s/obj$/$suffix/;

         $text .= $_ . "\n\n";
     }
 #$}
         $text .= $_ . "\n\n";
     }
 #$}


@@ -189,7 +192,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
         $text .= $_ . ": ";
         $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
         s/MSWDIR/COMMDIR/;
         $text .= $_ . ": ";
         $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
         s/MSWDIR/COMMDIR/;

-        s/obj/$suffix/;
+        s/obj$/$suffix/;

         $text .= $_ . "\n\n";
     }
 #$}
         $text .= $_ . "\n\n";
     }
 #$}


@@ -204,7 +207,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     foreach (@objs) {
         $text .= $_ . ": ";
         s/MSWDIR/GENDIR/;
     foreach (@objs) {
         $text .= $_ . ": ";
         s/MSWDIR/GENDIR/;

-        s/obj/\$(SRCSUFF)/;
+        s/obj$/\$(SRCSUFF)/;

         $text .= $_ . "\n\n";
     }
 #$}
         $text .= $_ . "\n\n";
     }
 #$}


@@ -224,26 +227,17 @@ all_execs:
     make -f makefile.bcc all_execs
     cd $(WXDIR)\src\msw
 
     make -f makefile.bcc all_execs
     cd $(WXDIR)\src\msw
 

-all_libs:
-    cd $(WXDIR)\src\msw
-    make -f makefile.bcc ctl3d dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
-          wxstring wxtree mfutils # wxxpm
-
-all_contribs:
-    cd $(WXDIR)\src\msw
-    make -f makefile.bcc ctl3d fafa wxstring itsy gauge # wxxpm
-

 # CONTRIB
 # CONTRIB

-ctl3d:  $(CFG)
-        cd $(WXDIR)\src\msw\ctl3d\borland
-        make -f makefile.bcc -DCFG=$(CFG)
-        cd $(WXDIR)\src\msw
-
-wxxpm: $(CFG)
+xpm:   $(CFG)

        cd $(WXDIR)\src\xpm
        make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
        cd $(WXDIR)\src\msw
 
        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)
         cd $(WXDIR)\src\png
         make -f makefile.bcc
 png:    $(CFG)
         cd $(WXDIR)\src\png
         make -f makefile.bcc