Changeset 163 in Sophya


Ignore:
Timestamp:
Dec 17, 1998, 1:58:04 AM (27 years ago)
Author:
ercodmgr
Message:

Portage/adaptation HP aCC , KCC (KAI Compiler, sous Linux) Reza 17/12/98

Location:
trunk/SophyaPI/PI
Files:
2 added
39 edited

Legend:

Unmodified
Added
Removed
  • trunk/SophyaPI/PI/Makefile

    r159 r163  
    44 
    55all: $(LIB)libPI.a
    6 $(LIB)libPI.a : $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)pibwdggen.o $(OBJ)pibwdgx.o $(OBJ)picmap.o $(OBJ)picmapgen.o $(OBJ)picmapview.o $(OBJ)picmapx.o $(OBJ)picons.o $(OBJ)picontainergen.o $(OBJ)picontainerx.o $(OBJ)pidrawer.o $(OBJ)pidrawwin.o $(OBJ)pidrwtools.o $(OBJ)pievthandler.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)piinit.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)pipodrw.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistlist.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)piup.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o
     6$(LIB)libPI.a : $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)pibwdggen.o $(OBJ)pibwdgx.o $(OBJ)picmap.o $(OBJ)picmapgen.o $(OBJ)picmapview.o $(OBJ)picmapx.o $(OBJ)picons.o $(OBJ)picontainergen.o $(OBJ)picontainerx.o $(OBJ)pidrawer.o $(OBJ)pidrawwin.o $(OBJ)pidrwtools.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)piinit.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)pipodrw.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistlist.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)piup.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o
    77        $(AR) $(ARFLAGS)  $@ $?
    88ifeq ($(CXX),cxx)
     
    1212 
    1313clean:
    14         rm -f $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)pibwdggen.o $(OBJ)pibwdgx.o $(OBJ)picmap.o $(OBJ)picmapgen.o $(OBJ)picmapview.o $(OBJ)picmapx.o $(OBJ)picons.o $(OBJ)picontainergen.o $(OBJ)picontainerx.o $(OBJ)pidrawer.o $(OBJ)pidrawwin.o $(OBJ)pidrwtools.o $(OBJ)pievthandler.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)piinit.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)pipodrw.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistlist.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)piup.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o
     14        rm -f $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)pibwdggen.o $(OBJ)pibwdgx.o $(OBJ)picmap.o $(OBJ)picmapgen.o $(OBJ)picmapview.o $(OBJ)picmapx.o $(OBJ)picons.o $(OBJ)picontainergen.o $(OBJ)picontainerx.o $(OBJ)pidrawer.o $(OBJ)pidrawwin.o $(OBJ)pidrwtools.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)piinit.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)pipodrw.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistlist.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)piup.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o
    1515ifeq ($(CXX),cxx)
    1616        cd $(REPM); rm -f *.o
     
    1919$(OBJ)lut.o: lut.cc $(INC)defs.h lut.h
    2020$(OBJ)parradapter.o: parradapter.cc parradapter.h \
    21  $(INC)defs.h $(INC)machine.h \
    22  lut.h
     21 $(INC)defs.h \
     22 $(INC)machine.h lut.h
    2323$(OBJ)pi3ddrw.o: pi3ddrw.cc pi3ddrw.h pisysdep.h pidrawer.h pibwdggen.h \
    2424 piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
    2525 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    26  $(INC)defs.h pigraph3d.h pibwdgx.h pigraphps.h \
    27  pidrwtools.h pistdwdgx.h pistdwdggen.h pioptmenux.h pioptmenugen.h \
    28  pimenux.h pimenugen.h piwindowx.h piwindowgen.h picontainerx.h \
    29  picontainergen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
    30  picons.h
     26 $(INC)defs.h pigraph3d.h pibwdgx.h \
     27 pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h pioptmenux.h \
     28 pioptmenugen.h pimenux.h pimenugen.h piwindowx.h piwindowgen.h \
     29 picontainerx.h picontainergen.h piapplx.h piapplgen.h pimenubarx.h \
     30 pimenubargen.h picons.h
    3131$(OBJ)piapplgen.o: piapplgen.cc piapplgen.h pimsghandler.h pisysdep.h \
    3232 picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimenubarx.h \
     
    7171$(OBJ)pidrawer.o: pidrawer.cc pidrawer.h pibwdggen.h pisysdep.h piwdgx.h \
    7272 piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h \
    73  pigraphgen.h pigraphuc.h psfile.h $(INC)defs.h
     73 pigraphgen.h pigraphuc.h psfile.h \
     74 $(INC)defs.h
    7475$(OBJ)pidrawwin.o: pidrawwin.cc pidrawwin.h pisysdep.h piwindowx.h \
    7576 piwindowgen.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
     
    8485 pimenubargen.h picons.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
    8586 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    86  $(INC)defs.h pigraphps.h piscdrawwdg.h pidrawer.h \
    87  pi3ddrw.h pigraph3d.h
    88 $(OBJ)pievthandler.o: pievthandler.cc
     87 $(INC)defs.h pigraphps.h piscdrawwdg.h \
     88 pidrawer.h pi3ddrw.h pigraph3d.h
    8989$(OBJ)pifilechogen.o: pifilechogen.cc pifilechogen.h pisysdep.h piwdgx.h \
    9090 piwdggen.h pimsghandler.h
     
    9696 $(INC)defs.h pigraphps.h pifilechox.h \
    9797 pifilechogen.h piwindowx.h piwindowgen.h
    98 $(OBJ)pigfd1.o: pigfd1.cc pigfd1.h $(INC)generaldata.h \
    99  $(INC)exceptions.h \
    100  $(INC)defs.h \
    101  $(INC)peidainit.h \
    102  $(INC)ppersist.h \
    103  $(INC)machine.h \
    104  $(INC)perrors.h \
    105  $(INC)pclassids.h \
    106  $(INC)poly.h $(INC)peida.h \
    107  $(INC)utils.h $(INC)fmath.h \
    108  $(INC)cvector.h \
    109  $(INC)matrix.h pidrawer.h pibwdggen.h pisysdep.h \
    110  piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
    111  pigraphx.h pigraphgen.h pigraphuc.h psfile.h
    112 $(OBJ)pigfd2.o: pigfd2.cc pigfd2.h $(INC)generaldata.h \
    113  $(INC)exceptions.h \
    114  $(INC)defs.h \
    115  $(INC)peidainit.h \
    116  $(INC)ppersist.h \
    117  $(INC)machine.h \
    118  $(INC)perrors.h \
    119  $(INC)pclassids.h \
    120  $(INC)poly.h $(INC)peida.h \
    121  $(INC)utils.h $(INC)fmath.h \
    122  $(INC)cvector.h \
    123  $(INC)matrix.h pi3ddrw.h pisysdep.h pidrawer.h \
    124  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
    125  picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h pigraph3d.h \
    126  pibwdgx.h pigraphps.h
     98$(OBJ)pigfd1.o: pigfd1.cc pigfd1.h \
     99 $(INC)generaldata.h \
     100 $(INC)exceptions.h \
     101 $(INC)defs.h \
     102 $(INC)peidainit.h \
     103 $(INC)ppersist.h \
     104 $(INC)machine.h \
     105 $(INC)perrors.h \
     106 $(INC)pclassids.h \
     107 $(INC)poly.h \
     108 $(INC)peida.h \
     109 $(INC)utils.h \
     110 $(INC)fmath.h \
     111 $(INC)cvector.h \
     112 $(INC)matrix.h pidrawer.h pibwdggen.h \
     113 pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
     114 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h
     115$(OBJ)pigfd2.o: pigfd2.cc pigfd2.h \
     116 $(INC)generaldata.h \
     117 $(INC)exceptions.h \
     118 $(INC)defs.h \
     119 $(INC)peidainit.h \
     120 $(INC)ppersist.h \
     121 $(INC)machine.h \
     122 $(INC)perrors.h \
     123 $(INC)pclassids.h \
     124 $(INC)poly.h \
     125 $(INC)peida.h \
     126 $(INC)utils.h \
     127 $(INC)fmath.h \
     128 $(INC)cvector.h \
     129 $(INC)matrix.h pi3ddrw.h pisysdep.h \
     130 pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h \
     131 picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
     132 pigraph3d.h pibwdgx.h pigraphps.h
    127133$(OBJ)pigraph3d.o: pigraph3d.cc pigraph3d.h pisysdep.h pigraphuc.h \
    128134 pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
     
    138144 piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h
    139145$(OBJ)pihisto.o: pihisto.cc pihisto.h $(INC)histos.h \
    140  $(INC)peida.h $(INC)defs.h \
    141  $(INC)utils.h $(INC)machine.h \
    142  $(INC)perrors.h \
    143  $(INC)exceptions.h \
    144  $(INC)peidainit.h \
    145  $(INC)fmath.h $(INC)cvector.h \
     146 $(INC)peida.h \
     147 $(INC)defs.h \
     148 $(INC)utils.h \
     149 $(INC)machine.h \
     150 $(INC)perrors.h \
     151 $(INC)exceptions.h \
     152 $(INC)peidainit.h \
     153 $(INC)fmath.h \
     154 $(INC)cvector.h \
    146155 $(INC)matrix.h \
    147156 $(INC)ppersist.h \
     
    155164 pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
    156165 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    157  $(INC)defs.h pigraphps.h pihisto2d.h pioptmenux.h \
    158  pioptmenugen.h $(INC)histos2.h \
    159  $(INC)peida.h $(INC)utils.h \
    160  $(INC)machine.h \
    161  $(INC)perrors.h \
    162  $(INC)exceptions.h \
    163  $(INC)peidainit.h \
    164  $(INC)fmath.h $(INC)histos.h \
     166 $(INC)defs.h pigraphps.h pihisto2d.h \
     167 pioptmenux.h pioptmenugen.h $(INC)histos2.h \
     168 $(INC)peida.h \
     169 $(INC)utils.h \
     170 $(INC)machine.h \
     171 $(INC)perrors.h \
     172 $(INC)exceptions.h \
     173 $(INC)peidainit.h \
     174 $(INC)fmath.h \
     175 $(INC)histos.h \
    165176 $(INC)cvector.h \
    166177 $(INC)matrix.h \
     
    169180 piwindowgen.h pidrawer.h $(INC)nbrandom.h
    170181$(OBJ)piimage.o: piimage.cc piimage.h parradapter.h \
    171  $(INC)defs.h $(INC)machine.h \
    172  lut.h pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h \
    173  pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
    174  pigraphuc.h psfile.h pipixmapx.h pipixmapgen.h pibwdgx.h pigraphps.h \
    175  pistdwdgx.h pistdwdggen.h piwindowx.h piwindowgen.h picontainerx.h \
    176  picontainergen.h picmapview.h piimgtools.h pioptmenux.h \
    177  pioptmenugen.h pimenux.h pimenugen.h piapplx.h piapplgen.h \
    178  pimenubarx.h pimenubargen.h picons.h pidrwtools.h
     182 $(INC)defs.h \
     183 $(INC)machine.h lut.h pisysdep.h pidrawer.h \
     184 pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
     185 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h pipixmapx.h \
     186 pipixmapgen.h pibwdgx.h pigraphps.h pistdwdgx.h pistdwdggen.h \
     187 piwindowx.h piwindowgen.h picontainerx.h picontainergen.h \
     188 picmapview.h piimgtools.h pioptmenux.h pioptmenugen.h pimenux.h \
     189 pimenugen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
     190 picons.h pidrwtools.h
    179191$(OBJ)piimgtools.o: piimgtools.cc piimgtools.h pisysdep.h pistdwdgx.h \
    180192 pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h pioptmenux.h \
     
    183195 pimenubargen.h picons.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
    184196 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    185  $(INC)defs.h pigraphps.h piimage.h parradapter.h \
    186  $(INC)machine.h lut.h pidrawer.h pipixmapx.h \
    187  pipixmapgen.h picmapview.h
     197 $(INC)defs.h pigraphps.h piimage.h \
     198 parradapter.h $(INC)machine.h lut.h \
     199 pidrawer.h pipixmapx.h pipixmapgen.h picmapview.h
    188200$(OBJ)piinit.o: piinit.cc $(INC)defs.h piinit.h \
    189  $(INC)strecinit.h \
    190201 $(INC)imaginit.h \
    191202 $(INC)outilsinit.h \
     
    212223 pimenugen.h piwdgx.h piwdggen.h pimsghandler.h
    213224$(OBJ)pimsghandler.o: pimsghandler.cc pimsghandler.h
    214 $(OBJ)pintup3d.o: pintup3d.cc pintup3d.h $(INC)ntuple.h \
    215  $(INC)ppersist.h $(INC)defs.h \
    216  $(INC)machine.h \
    217  $(INC)perrors.h \
    218  $(INC)exceptions.h \
    219  $(INC)peidainit.h \
    220  $(INC)pclassids.h \
    221  $(INC)dvlist.h pi3ddrw.h pisysdep.h pidrawer.h \
    222  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
    223  picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h pigraph3d.h \
    224  pibwdgx.h pigraphps.h
    225 $(OBJ)pintuple.o: pintuple.cc pintuple.h $(INC)ntuple.h \
    226  $(INC)ppersist.h $(INC)defs.h \
    227  $(INC)machine.h \
    228  $(INC)perrors.h \
    229  $(INC)exceptions.h \
    230  $(INC)peidainit.h \
    231  $(INC)pclassids.h \
    232  $(INC)dvlist.h pidrawer.h pibwdggen.h pisysdep.h \
    233  piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
    234  pigraphx.h pigraphgen.h pigraphuc.h psfile.h
     225$(OBJ)pintup3d.o: pintup3d.cc pintup3d.h \
     226 $(INC)ntuple.h \
     227 $(INC)ppersist.h \
     228 $(INC)defs.h \
     229 $(INC)machine.h \
     230 $(INC)perrors.h \
     231 $(INC)exceptions.h \
     232 $(INC)peidainit.h \
     233 $(INC)pclassids.h \
     234 $(INC)dvlist.h pi3ddrw.h pisysdep.h \
     235 pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h \
     236 picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
     237 pigraph3d.h pibwdgx.h pigraphps.h
     238$(OBJ)pintuple.o: pintuple.cc pintuple.h \
     239 $(INC)ntuple.h \
     240 $(INC)ppersist.h \
     241 $(INC)defs.h \
     242 $(INC)machine.h \
     243 $(INC)perrors.h \
     244 $(INC)exceptions.h \
     245 $(INC)peidainit.h \
     246 $(INC)pclassids.h \
     247 $(INC)dvlist.h pidrawer.h pibwdggen.h \
     248 pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
     249 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h
    235250$(OBJ)pioptmenugen.o: pioptmenugen.cc pioptmenugen.h pisysdep.h pimenux.h \
    236251 pimenugen.h piwdgx.h piwdggen.h pimsghandler.h
     
    258273 $(INC)machine.h lut.h \
    259274 $(INC)cvector.h \
    260  $(INC)matrix.h $(INC)peida.h \
    261  $(INC)utils.h $(INC)perrors.h \
     275 $(INC)matrix.h \
     276 $(INC)peida.h \
     277 $(INC)utils.h \
     278 $(INC)perrors.h \
    262279 $(INC)exceptions.h \
    263280 $(INC)peidainit.h \
     
    283300$(OBJ)pistdwdgx.o: pistdwdgx.cc pisysdep.h pistdwdgx.h pistdwdggen.h \
    284301 piwdgx.h piwdggen.h pimsghandler.h
    285 $(OBJ)pistlist.o: pistlist.cc pistlist.h $(INC)stlist.h \
    286  $(INC)machine.h $(INC)defs.h \
     302$(OBJ)pistlist.o: pistlist.cc pistlist.h \
     303 $(INC)stlist.h \
     304 $(INC)machine.h \
     305 $(INC)defs.h \
    287306 $(INC)exceptions.h \
    288307 $(INC)peidainit.h \
     
    292311 $(INC)pclassids.h \
    293312 $(INC)star.h \
    294  $(INC)starmacro.h $(INC)psf.h \
    295  $(INC)peida.h $(INC)utils.h \
    296  $(INC)fmath.h $(INC)cimage.h \
     313 $(INC)starmacro.h \
     314 $(INC)psf.h \
     315 $(INC)peida.h \
     316 $(INC)utils.h \
     317 $(INC)fmath.h \
     318 $(INC)cimage.h \
    297319 $(INC)rzimage.h \
    298320 $(INC)rzvect.h \
     
    304326 $(INC)cvector.h \
    305327 $(INC)generaldata.h \
    306  $(INC)poly.h $(INC)fct2dfit.h \
     328 $(INC)poly.h \
     329 $(INC)fct2dfit.h \
    307330 $(INC)pixelmap.h \
    308  $(INC)transfo.h $(INC)zfidu.h \
     331 $(INC)transfo.h \
     332 $(INC)zfidu.h \
    309333 $(INC)imgalig.h \
    310334 $(INC)fitsimage.h \
     
    321345 $(INC)erostarfile.h \
    322346 $(INC)xstrstream.h \
    323  $(INC)dates.h $(INC)tarlib.h \
    324  pidrawer.h pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h \
    325  picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h \
    326  psfile.h
     347 $(INC)dates.h \
     348 $(INC)tarlib.h pidrawer.h pibwdggen.h \
     349 pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
     350 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h
    327351$(OBJ)pistzwin.o: pistzwin.cc pistzwin.h pisysdep.h piwindowx.h \
    328352 piwindowgen.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
     
    331355 picmapx.h picmapgen.h
    332356$(OBJ)pisurfdr.o: pisurfdr.cc pisurfdr.h parradapter.h \
    333  $(INC)defs.h $(INC)machine.h \
    334  lut.h pi3ddrw.h pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h \
    335  pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
    336  pigraphuc.h psfile.h pigraph3d.h pibwdgx.h pigraphps.h
     357 $(INC)defs.h \
     358 $(INC)machine.h lut.h pi3ddrw.h pisysdep.h \
     359 pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h \
     360 picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
     361 pigraph3d.h pibwdgx.h pigraphps.h
    337362$(OBJ)piup.o: piup.cc $(INC)ctimer.h \
    338  $(INC)peida.h $(INC)defs.h \
    339  $(INC)utils.h $(INC)machine.h \
    340  $(INC)perrors.h \
    341  $(INC)exceptions.h \
    342  $(INC)peidainit.h \
    343  $(INC)fmath.h $(INC)imageop.h \
     363 $(INC)peida.h \
     364 $(INC)defs.h \
     365 $(INC)utils.h \
     366 $(INC)machine.h \
     367 $(INC)perrors.h \
     368 $(INC)exceptions.h \
     369 $(INC)peidainit.h \
     370 $(INC)fmath.h \
     371 $(INC)imageop.h \
    344372 $(INC)cimage.h \
    345373 $(INC)rzimage.h \
     
    365393 $(INC)erostarfile.h \
    366394 $(INC)xstrstream.h \
    367  $(INC)dates.h $(INC)tarlib.h \
    368  piup.h
     395 $(INC)dates.h \
     396 $(INC)tarlib.h piup.h
    369397$(OBJ)piwdggen.o: piwdggen.cc piwdggen.h pimsghandler.h picontainergen.h \
    370398 pisysdep.h piwdgx.h psfile.h $(INC)defs.h \
  • trunk/SophyaPI/PI/exclude

    r113 r163  
    2929pitestapp.cc
    3030piup_def.cc
     31xdispim.c
     32piup.c
  • trunk/SophyaPI/PI/pi3ddrw.cc

    r158 r163  
    129129  list<int>::iterator it;
    130130  for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
    131 #if defined(__GNUC__) && !defined(GCCV28)
     131#if defined(__DECCXX) || defined(__KCC__)
     132    (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);
     133#else
    132134    ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);
    133 #else
    134     (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);
    135135#endif
    136136  vfixed = true;
     
    144144  list<int>::iterator it;
    145145  for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
    146 #if defined(__GNUC__) && !defined(GCCV28)
     146#if defined(__DECCXX) || defined(__KCC__)
     147    (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);
     148#else
    147149    ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);
    148 #else
    149     (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);
    150150#endif
    151151  vfixed = true;
     
    165165  list<int>::iterator it = m3DrIl.begin();
    166166  if (it == m3DrIl.end())  return;
    167 #if defined(__GNUC__) && !defined(GCCV28)
     167#if defined(__DECCXX) || defined(__KCC__)
     168  PIDrawer3D* dr3 = dynamic_cast<PIDrawer3D*>(GetDrawerId(*it));
     169#else
    168170  PIDrawer3D* dr3 = (PIDrawer3D*)(GetDrawerId(*it));
    169 #else
    170   PIDrawer3D* dr3 = dynamic_cast<PIDrawer3D*>(GetDrawerId(*it));
    171171#endif
    172172  if (dr3 == NULL)  return;
     
    191191  vo = mGr3d->Get3DCS( xc, yc, zc, xo, yo, zo, teta, phi, psi, dax, day, co, dco);
    192192  list<int>::iterator it;
    193 #if defined(__GNUC__) && !defined(GCCV28)
     193
     194#if defined(__DECCXX) || defined(__KCC__)
     195  if (vo)   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
     196    (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);
     197  else   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
     198    (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);   
     199#else
    194200  if (vo)   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
    195201    ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);
    196202  else   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
    197203    ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);   
    198 #else
    199   if (vo)   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
    200     (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);
    201   else   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
    202     (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);   
    203204#endif
    204205
  • trunk/SophyaPI/PI/pi3ddrw.h

    r158 r163  
    1313#include PIBWDG_H
    1414
    15 #include <list>
    1615
    1716// -----------------  Traceur (Drawer) 3D  -------------------
  • trunk/SophyaPI/PI/piapplx.cc

    r141 r163  
    9191                            sx, sy, 0, msy);
    9292topcont->Show();
    93 
    9493MBCont()->Show();
     94
    9595topwdg->Manage();
    9696
     
    258258fcntl(p[0], F_SETFL, O_NONBLOCK);
    259259
     260#if (!defined(__GNUG__) && !defined(__aCC__))
    260261setlinebuf(stdout);
     262#endif
    261263ios::sync_with_stdio();
    262264
     
    290292fcntl(p[0], F_SETFL, O_NONBLOCK);
    291293
     294#if (!defined(__GNUG__) && !defined(__aCC__))
    292295setlinebuf(stderr);
     296#endif
    293297ios::sync_with_stdio();
    294298
  • trunk/SophyaPI/PI/pibwdggen.cc

    r158 r163  
    1010#include "pidrwtools.h"
    1111
     12static inline void fl_swap(float& a, float& b) { float tmp = a; a = b; b = tmp;  }
    1213
    1314//++
     
    536537    guc->GrC2UC(XSize(), YSize(), xmax, ymax);   
    537538    }
    538   if (xmin > xmax)  swap(xmin,xmax);
    539   if (ymin > ymax)  swap(ymin,ymax);
     539  if (xmin > xmax)  fl_swap(xmin,xmax);
     540  if (ymin > ymax)  fl_swap(ymin,ymax);
    540541  (*it).drw->Draw(guc, xmin, ymin, xmax, ymax);
    541542  g->RestoreGraphicAtt();
     
    592593    guc->GrC2UC(0, 0, xmin, ymin);
    593594    guc->GrC2UC(XSize(), YSize(), xmax, ymax);     
    594     if (xmin > xmax)  swap(xmin,xmax);
    595     if (ymin > ymax)  swap(ymin,ymax);
     595    if (xmin > xmax)  fl_swap(xmin,xmax);
     596    if (ymin > ymax)  fl_swap(ymin,ymax);
    596597    (*it).drw->Draw(guc, xmin, ymin, xmax, ymax);
    597598    g->RestoreGraphicAtt();   
  • trunk/SophyaPI/PI/pibwdggen.h

    r158 r163  
    1212// Mettre dans cet ordre, sinon g++ a des problemes   
    1313#include <vector>   
     14#if defined(__KCC__)
     15#include <vector.h>
     16#endif
    1417
    1518enum PIKeyModifier { PIKM_Blank = 0, PIKM_Shift = 1, PIKM_Alt = 2, PIKM_Cntl = 4 } ;
  • trunk/SophyaPI/PI/picmap.cc

    r72 r163  
    33#define  MXMAPIDS   10
    44static   int    MapNCols[MXMAPIDS] = {256, 256, 256, 256, 256, 256, 256, 256, 256, 256};
    5 static   char*  MapNoms[MXMAPIDS]  = {"Grey32","InvGrey32","ColRJ32","ColBR32",
     5static   const char*  MapNoms[MXMAPIDS]  = {"Grey32","InvGrey32","ColRJ32","ColBR32",
    66                               "ColRV32", "Grey128", "InvGrey128", "ColRJ128",
    77                               "ColBR128", "Col16"};
  • trunk/SophyaPI/PI/picmapgen.cc

    r63 r163  
    22#include <list>
    33#include <algorithm>
     4#if defined(__KCC__)
     5#include <list.h>
     6#include <algorithm.h>
     7#endif
    48#include "pisysdep.h"
    59#include PICMAPNTV_H
  • trunk/SophyaPI/PI/picmapgen.h

    r64 r163  
    55#include <string>
    66#include <string.h>
     7#if defined(__KCC__)
     8using std::string ;
     9#endif
    710
    811
  • trunk/SophyaPI/PI/picmapx.cc

    r112 r163  
    4747PIColor PIColorMapX::GetColor(int n)
    4848{
    49 PIColor picr;
    50 picr.red = picr.green = picr.blue = 0;
    51 
    5249if ((n<0) || (n >= NCol()))   
    5350  {
     
    6057
    6158static  Colormap  defxcmap;
    62 static  xinicmap = 0;
     59static  int xinicmap = 0;
    6360static int NTotColors = 0;
    6461static int NTotAllocCol = 0;
  • trunk/SophyaPI/PI/pidrawer.cc

    r158 r163  
    55
    66#include "pidrawer.h"
    7 #include "psfile.h"
    87
    98//++
  • trunk/SophyaPI/PI/pidrawer.h

    r158 r163  
    88#include "pibwdggen.h"
    99#include "pigraphuc.h"
     10
    1011#include <list>
     12#if defined(__KCC__)
     13#include <list.h>
     14#endif
    1115
    1216enum {
  • trunk/SophyaPI/PI/pidrwtools.cc

    r158 r163  
    236236{
    237237if (cwdrwt == this)  cwdrwt = NULL;
    238 for(int i=0; i<2; i++)
     238int i;
     239for(i=0; i<2; i++)
    239240  {
    240241  delete mLab[i];
     
    245246  }
    246247delete mBut[2];
    247 for(int i=0; i<6; i++)  delete mOpt[i];
     248for(i=0; i<6; i++)  delete mOpt[i];
    248249delete mNlb;
    249250}
  • trunk/SophyaPI/PI/pierrdisp.h

    r23 r163  
    88#include PICONT_H
    99#include PIPERIOD_H
    10 #include <string>
    1110
    1211#include "errorhandlerc.h"
  • trunk/SophyaPI/PI/pifilechogen.h

    r23 r163  
    22#define PIFILCHOGEN_H_SEEN
    33
    4 #include <string>
    54#include "pisysdep.h"
    65#include PIWDG_H
  • trunk/SophyaPI/PI/pifilechox.h

    r23 r163  
    22#define PIFILCHOX_H_SEEN
    33
    4 #include <string>
    54#include "pisysdep.h"
    65#include "pifilechogen.h"
  • trunk/SophyaPI/PI/pigfd2.cc

    r151 r163  
    6464if(mLAtt!=PI_NotDefLineAtt) SelectErrBar(true,true,true);
    6565
    66 #if defined(__GNUC__) && !defined(GCCV28)
     66#if defined(__DECCXX) || defined(__KCC__)
     67PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g);
     68#else
    6769PIGraphic3D* g3 = (PIGraphic3D*)(g);
    68 #else
    69 PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g);
    7070#endif
    7171
  • trunk/SophyaPI/PI/pigfname.h

    r2 r163  
    33
    44#include <string>
     5#if defined(__KCC__)
     6using std::string ;
     7#endif
    58
    69string PIGetFileName(string = "");
  • trunk/SophyaPI/PI/pigraph3d.cc

    r158 r163  
    9696//|     psi : rotation du plan image
    9797//--
     98
     99#if defined(__KCC__)
     100#ifndef M_PI
     101#define M_PI            3.14159265358979323846  /* pi */
     102#define M_PI_2          1.57079632679489661923  /* pi/2 */
     103#endif
     104#endif
    98105
    99106static float deuxpi = 2*M_PI;
  • trunk/SophyaPI/PI/pigraphps.cc

    r158 r163  
    188188xtmp = new float[n];
    189189ytmp = new float[n];
    190 for(int i = 0 ; i < n ; i++) {xtmp[i] = (float)x[i] ; ytmp[i] = (float)y[i] ; }
     190for(i = 0 ; i < n ; i++) {xtmp[i] = (float)x[i] ; ytmp[i] = (float)y[i] ; }
    191191//float xoff,yoff;
    192192//if (cinc) { xoff=yoff=0.; }   // Coord en mode incremental
     
    217217xtmp = new float[n];
    218218ytmp = new float[n];
    219 for(int i = 0 ; i < n ; i++) {xtmp[i] = (float)x[i] ; ytmp[i] = (float)y[i] ; }
     219for(i = 0 ; i < n ; i++) {xtmp[i] = (float)x[i] ; ytmp[i] = (float)y[i] ; }
    220220//float xoff,yoff;
    221221//if (cinc) { xoff=yoff=0.; }   // Coord en mode incremental
  • trunk/SophyaPI/PI/piimage.cc

    r138 r163  
    77#include <stdlib.h>
    88#include <stdio.h>
    9 #include <string>
    109#include <string.h>
    1110
  • trunk/SophyaPI/PI/piimgtools.cc

    r157 r163  
    199199{
    200200if (curlutw == this)  curlutw = NULL;
    201 for(int i=0; i<2; i++)
     201int i;
     202for(i=0; i<2; i++)
    202203  {
    203204  delete mLab[i];
     
    209210  delete mOptzc[i];
    210211  }
    211 for(int i=0; i<5; i++)  delete mButsz[i];
    212 for(int i=0; i<3; i++)  delete mButcax[i];
    213 for(int i=0; i<5; i++)  delete mButoa[i];
     212for(i=0; i<5; i++)  delete mButsz[i];
     213for(i=0; i<3; i++)  delete mButcax[i];
     214for(i=0; i<5; i++)  delete mButoa[i];
    214215
    215216}
  • trunk/SophyaPI/PI/piinit.cc

    r140 r163  
    66
    77PeidaInteractiveInitiator::PeidaInteractiveInitiator()
    8  : PeidaStarRecoInitiator()
     8 : PeidaImagesInitiator()
    99{
    1010  FgInit++;
  • trunk/SophyaPI/PI/piinit.h

    r162 r163  
    22#define PIINIT_H_SEEN
    33
    4 #include "strecinit.h"
     4#include "imaginit.h"
    55
    66// Classe d'initialisation pour le module PI de PEIDA
    77
    8 class PeidaInteractiveInitiator : public PeidaStarRecoInitiator{
     8class PeidaInteractiveInitiator : public PeidaImagesInitiator{
    99private:
    1010  static int FgInit;
  • trunk/SophyaPI/PI/pilistx.cc

    r113 r163  
    107107mNItem++;
    108108
     109#if defined(__xlC)
     110XmString xms = XmStringCreate((char *)(item), XmSTRING_DEFAULT_CHARSET);
     111#else
    109112XmString xms = XmStringCreate(const_cast<char *>(item), XmSTRING_DEFAULT_CHARSET);
     113#endif
    110114XmListAddItem(mlist, xms, 0);
    111115XmStringFree(xms);
  • trunk/SophyaPI/PI/pintup3d.cc

    r138 r163  
    8484if ( (xK < 0) || (yK < 0) || (zK < 0) )  return;
    8585
    86 #if defined(__GNUC__) && !defined(GCCV28)
     86#if defined(__DECCXX) || defined(__KCC__)
     87PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g);
     88#else
    8789PIGraphic3D* g3 = (PIGraphic3D*)(g);
    88 #else
    89 PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g);
    9090#endif
    9191
  • trunk/SophyaPI/PI/pioptmenugen.h

    r110 r163  
    22#define PIOPTMENGEN_H_SEEN
    33
    4 #include <string>
    54#include "pisysdep.h"
    65#include PIMENU_H
  • trunk/SophyaPI/PI/pipixmapgen.h

    r128 r163  
    1010
    1111#include <list>
     12#if defined(__KCC__)
     13#include <list.h>
     14#endif
    1215
    1316class PIPixmapGen : public PIBaseWdg
  • trunk/SophyaPI/PI/pipixmapx.cc

    r127 r163  
    66
    77#include "pipixmapx.h"
    8 #include "psfile.h"
    98
    109static  GC    mygc;
     
    130129XGCValues       values;
    131130XtGCMask        mask;
    132 Display *mdsp;
    133 int scr;
    134131
    135132if (fgxpxm)  return;
    136133fgxpxm = true;
    137134
    138 mdsp = XtDisplay(XtWdg());
    139 scr = XDefaultScreen(mdsp);
    140135
    141136mask = GCFunction | GCPlaneMask;
     
    154149void PIPixmapX::AllocXImg()
    155150{
    156 Window xw;
    157151Display * mdsp;
    158152int scr;
     
    161155int i,j;
    162156
    163 xw = XtWindow(XtWdg());
    164157mdsp = PIXDisplay();
    165158scr = PIXScreen();
  • trunk/SophyaPI/PI/piscdrawwdg.cc

    r162 r163  
    66#include "pidrwtools.h"
    77#include "parradapter.h"
     8
     9static inline void fl_swap(float& a, float& b) { float tmp = a; a = b; b = tmp;  }
    810
    911PIScDrawWdg::PIScDrawWdg(PIContainerGen *par, char *nom,
     
    224226    mBDrw->GetGraphicUC()->GrC2UC(xBegDrag, yBegDrag, xl, yl);
    225227    mBDrw->GetGraphicUC()->GrC2UC(xEndDrag, yEndDrag, xh, yh);
    226     if (xl > xh) swap(xl, xh);
    227     if (yl > yh) swap(yl, yh);
     228    if (xl > xh) fl_swap(xl, xh);
     229    if (yl > yh) fl_swap(yl, yh);
    228230    SetLimits(xl,xh,yl,yh, kAxeDirSame, kAxeDirSame, true);
    229231  }
  • trunk/SophyaPI/PI/pistdwdggen.h

    r126 r163  
    22#define PISTDWDGGEN_H_SEEN
    33
    4 #include <string>
     4
    55#include "pisysdep.h"
    66#include PIWDG_H
     
    8484  kSDirRtoL     = 2,
    8585  kSDirDownUp   = 4,
    86   kSDirUpDown   = 8,
     86  kSDirUpDown   = 8
    8787};
    8888
  • trunk/SophyaPI/PI/pisurfdr.cc

    r154 r163  
    8282  if (mArr == NULL)  return;
    8383
    84 #if defined(__GNUC__) && !defined(GCCV28)
     84#if defined(__DECCXX) || defined(__KCC__)
     85  PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g);
     86#else
    8587  PIGraphic3D* g3 = (PIGraphic3D*)(g);
    86 #else
    87   PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g);
    8888#endif
    8989
  • trunk/SophyaPI/PI/piwdggen.h

    r158 r163  
    88
    99#include <string>
     10#if defined(__KCC__)
     11using std::string ;
     12#endif
    1013
    1114#include "pimsghandler.h"
  • trunk/SophyaPI/PI/piwdgx.cc

    r138 r163  
    123123int n=0;
    124124
     125#ifdef DEBUG_PIWdgX
     126printf("Debug_PIWdgX::CreateXtWdg(%s) Getting in \n");
     127#endif
     128
    125129if (pwdg == NULL)
    126130  {
     
    503507
    504508// Ressources X si non definis
    505 static String fallback_res[22] = {
     509static const String fallback_res[22] = {
    506510"PeidaInt*default*background:                 LightGrey" ,
    507511"PeidaInt*background:                         LightGrey" ,
     
    537541// Initialisation ... 
    538542int n;
    539 char *pc = "PIWdgX";
     543const char *pc = (const char *)"PIWdgX";
    540544char **ppc;
    541545if (narg > 0)  { n = narg, ppc = arg; }
    542 else { ppc = &pc; n = 1; }
     546#if defined(__xlC)
     547else { ppc = (char **)(&pc); n = 1; }
     548#else
     549else { ppc = const_cast<char **>(&pc); n = 1; }
     550#endif
    543551//  strncpy(appname, ppc[0], 63); appname[63] = '\0';
    544552strncpy(appclass,"PeidaInt",63);  appclass[63] = '\0';     
    545553//  top = XtAppInitialize(&appctx, appclass, NULL, 0, &n, ppc);
    546 top = XtVaAppInitialize(&appctx, appclass, NULL, 0, &n, ppc, fallback_res, NULL);
     554#if defined(__xlC)
     555top = XtVaAppInitialize(&appctx, appclass, NULL, 0, &n, ppc, (String*)(fallback_res), NULL);
     556#else
     557top = XtVaAppInitialize(&appctx, appclass, NULL, 0, &n, ppc, const_cast<String*>(fallback_res), NULL);
     558#endif
    547559dpy = XtDisplay(top);
    548560
    549561// On va recuperer la fonte par defaut des composantes Motif
    550562XtResource res[] = {
    551   { "fontList", "FontList", XtRString, sizeof(String),
     563  { (char *)"fontList", (char *)"FontList", XtRString, sizeof(String),
    552564    0, XtRString, "-*-courier-bold-*-*-*-*-*-*-*-*-*-*-*" }
    553565};
  • trunk/SophyaPI/PI/piwindowx.cc

    r154 r163  
    7878  if (fgactl == 0)
    7979    {
    80     XtActionsRec desact = {"CloseWindow" ,CloseWindow};
     80    XtActionsRec desact = {(char *)"CloseWindow" ,CloseWindow};
    8181    int szx, szy, szf;
    8282    XtAppContext * appctx = PIXtAppCtx(szx, szy, szf);
  • trunk/SophyaPI/PI/pixtbase.cc

    r158 r163  
    4343
    4444static XtResource resources[] ={
    45   {PIXNobject ,"Object", XtRPointer, sizeof(XtRPointer),
     45  {PIXNobject ,(char *)"Object", XtRPointer, sizeof(XtRPointer),
    4646   XtOffset(PIXtBaseWidget,  pixtbase.objet), XtRImmediate, (XtPointer)0},
    4747};
     
    5353
    5454(WidgetClass) &coreClassRec,    /* pointer to superclass ClassRec   */
    55 "PIXtBase",                     /* widget resource class name       */
     55(char*)"PIXtBase",              /* widget resource class name       */
    5656sizeof(PIXtBaseRec),            /* size in bytes of widget record   */
    5757init_class_pixtbase,            /* class_initialize                 */
  • trunk/SophyaPI/PI/psfile.cc

    r158 r163  
    295295 */
    296296PSFile::PSFile(const char * FileName, float sc)
     297#if defined(__xlC)
     298    : mPSFileName(FileName==NULL? "unnamed.eps" : (char *)(FileName)),
     299#else
    297300    : mPSFileName(FileName==NULL? "unnamed.eps" : const_cast<char *>(FileName)),
     301#endif
    298302      Tw (-1.), Th(-1.),         /* Non specifies pour du eps  */
    299303      WMargin (-1), HMargin(-1), /* Non specifiees en eps  */
     
    356360               PIPaperSize   paperSize,
    357361               float marginX, float marginY)
     362#if defined(__xlC)
     363 :  mPSFileName (FileName == NULL ? "unnamed.ps" : (char *)(FileName)),
     364#else
    358365 :  mPSFileName (FileName == NULL ? "unnamed.ps" : const_cast<char *>(FileName)),
    359 
     366#endif
    360367    Tw(PaperSizeTable[paperSize].width),  /* Format papier utilise */
    361368    Th(PaperSizeTable[paperSize].height), /*                       */
     
    429436
    430437
    431 char* PSFile::GetFileName() {
     438const char* PSFile::GetFileName() {
    432439
    433440    return(mPSFileName);
     
    884891    fprintf(mPSFile, "%.2f Ux %.2f Uy m\n", x[0], y[0]);
    885892
    886     char* cmd ;
     893    const char* cmd ;
    887894    if(cinc == true) cmd = "%.2f Ux %.2f Uy rl\n" ;
    888895    else             cmd = "%.2f Ux %.2f Uy l\n" ;
     
    905912    }
    906913
    907     char* cmd ;
     914    const char* cmd ;
    908915    if(cinc == true) cmd = "%.2f Ux %.2f Uy rl\n" ;
    909916    else             cmd = "%.2f Ux %.2f Uy l\n" ;
  • trunk/SophyaPI/PI/psfile.h

    r158 r163  
    3131
    3232#include <list>
     33#if defined(__KCC__)
     34#include <list.h>
     35#endif
    3336
    3437enum PIPaperSize { PI_A4 = 1, PI_A3 = 2, PI_A5 = 3, PI_NotDefPaperSize = 0};
     
    8184
    8285    virtual int     IsEPS();
    83     virtual char*   GetFileName();
     86    virtual const char*   GetFileName();
    8487
    8588
     
    147150                        PIColorMap *mColorMap);
    148151
    149 #ifndef __DECCXX
     152#if !defined(__DECCXX) && !defined(__aCC__)
    150153private:
    151154#endif
     
    175178    typedef list<Page> PageList;  /* STL */
    176179
    177 #ifdef __DECCXX
     180#if defined(__DECCXX) || defined(__aCC__)
    178181private:
    179182#endif
     
    181184    /* Fichier ps/eps */
    182185    FILE *   mPSFile;
    183     char *   mPSFileName;
     186    const char *   mPSFileName;
    184187    float    Tw,Th ;              /* Format, en cm */
    185188    float    WMargin,HMargin ;    /* Marges minimales */
Note: See TracChangeset for help on using the changeset viewer.