[Felix-impl] lpsrc flx_maker.pak,1.53,1.54 flx_rtl.pak,1.38,1.39 flx_sdl.pak,1.15,1.16

[John S. <sk...@us...>]

Update of /cvsroot/felix/lpsrc
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7219

Modified Files:
	flx_maker.pak flx_rtl.pak flx_sdl.pak 
Log Message:
Fixed make script so static link tests work. It's a hack,
static link now requires async to work (the version that
doesn't is clobbered .. the make system provides no
way to named the object file different from the input
source file).


Index: flx_maker.pak
===================================================================
RCS file: /cvsroot/felix/lpsrc/flx_maker.pak,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** flx_maker.pak	18 May 2006 04:28:10 -0000	1.53
--- flx_maker.pak	18 May 2006 08:59:57 -0000	1.54
***************
*** 7,10 ****
--- 7,17 ----
  @head(2,'CVS LOG')
  $Log$
+ Revision 1.54  2006/05/18 08:59:57  skaller
+ Fixed make script so static link tests work. It's a hack,
+ static link now requires async to work (the version that
+ doesn't is clobbered .. the make system provides no
+ way to named the object file different from the input
+ source file).
+ 
  Revision 1.53  2006/05/18 04:28:10  idadesub
  commented out the options checking so that arbitrary options can be run
***************
*** 1639,1650 ****
    if len(DRIVERS)>0:
      print "COMPILING DRIVERS (static)"
!     for i,j,k in DRIVERS:
!       if verbose: print 'static Compiling driver object',i
!       dir,base = os.path.split(i)
!       TARGET_CXX.compile_static_main(
!         xqt,dir,base,dir,
!         include_path=["rtl"],
!         macros=["FLX_STATIC_LINK"]+k,
!         optimise=1,CFLAGS=CFLAGS+cflags)
  
  @select(tangler('mkplugins/build_felix_dynamic_drivers.py'))
--- 1646,1658 ----
    if len(DRIVERS)>0:
      print "COMPILING DRIVERS (static)"
!     for mode,i,j,k in DRIVERS:
!       if mode=='static':
!         if verbose: print 'static Compiling driver object',i
!         dir,base = os.path.split(i)
!         TARGET_CXX.compile_static_main(
!           xqt,dir,base,dir,
!           include_path=["rtl"],
!           macros=["FLX_STATIC_LINK"]+k,
!           optimise=1,CFLAGS=CFLAGS+cflags)
  
  @select(tangler('mkplugins/build_felix_dynamic_drivers.py'))
***************
*** 1659,1667 ****
      for lib in LIBS:
        libs.append(lib+"_dynamic")
!     for i,j,k in DRIVERS:
        # this is a gross HACK! Don't make dynamic versions
        # of drivers with extra macros, they're for static
        # link of driver without async support
!       if k == []:
          if verbose: print 'dynamic Compiling driver object',i
          dir,base = os.path.split(i)
--- 1667,1675 ----
      for lib in LIBS:
        libs.append(lib+"_dynamic")
!     for mode,i,j,k in DRIVERS:
        # this is a gross HACK! Don't make dynamic versions
        # of drivers with extra macros, they're for static
        # link of driver without async support
!       if mode=='dynamic':
          if verbose: print 'dynamic Compiling driver object',i
          dir,base = os.path.split(i)
***************
*** 1670,1673 ****
--- 1678,1682 ----
            include_path=["rtl"],
            optimise=1,
+           macros=k,
            CFLAGS=CFLAGS+cflags)
          TARGET_CXX.link_dynamic_program(

Index: flx_rtl.pak
===================================================================
RCS file: /cvsroot/felix/lpsrc/flx_rtl.pak,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** flx_rtl.pak	18 May 2006 05:10:10 -0000	1.38
--- flx_rtl.pak	18 May 2006 08:59:57 -0000	1.39
***************
*** 1,4 ****
--- 1,11 ----
  @head(1,"Run time driver support library")
  $Log$
+ Revision 1.39  2006/05/18 08:59:57  skaller
+ Fixed make script so static link tests work. It's a hack,
+ static link now requires async to work (the version that
+ doesn't is clobbered .. the make system provides no
+ way to named the object file different from the input
+ source file).
+ 
  Revision 1.38  2006/05/18 05:10:10  rfistman
  fixed mac dylib extension thing
***************
*** 344,351 ****
  
  DRIVERS = [
!   ('rtl/flx_run','bin/flx_run',[]),
!   ('rtl/flx_run','bin/flx_arun',['DFLX_SUPPORT_ASYNC']),
!   ('test/flx_perf_drv1','test/flx_perf_drv1',[]),
!   ('test/micky_mouse','bin/micky_mouse',[]),
  ]
  
--- 351,361 ----
  
  DRIVERS = [
!   ('static','rtl/flx_run','rtl/flx_run',[]),
!   ('dynamic','rtl/flx_run','bin/flx_run',[]),
!   ('static','rtl/flx_run','rtl/flx_arun',['FLX_SUPPORT_ASYNC']),
!   ('dynamic','test/flx_perf_drv1','test/flx_perf_drv1',[]),
!   ('static','test/flx_perf_drv1','test/flx_perf_drv1',[]),
!   ('static','test/micky_mouse','bin/micky_mouse',[]),
!   ('dynamic','test/micky_mouse','bin/micky_mouse',[]),
  ]
  

Index: flx_sdl.pak
===================================================================
RCS file: /cvsroot/felix/lpsrc/flx_sdl.pak,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** flx_sdl.pak	18 May 2006 03:23:41 -0000	1.15
--- flx_sdl.pak	18 May 2006 08:59:57 -0000	1.16
***************
*** 2,5 ****
--- 2,12 ----
  @head(1,'SDL')
  $Log$
+ Revision 1.16  2006/05/18 08:59:57  skaller
+ Fixed make script so static link tests work. It's a hack,
+ static link now requires async to work (the version that
+ doesn't is clobbered .. the make system provides no
+ way to named the object file different from the input
+ source file).
+ 
  Revision 1.15  2006/05/18 03:23:41  skaller
  update drivers with hack. Known to be bugged, sorry,
***************
*** 294,298 ****
  if HAVE_SDL:
    DRIVERS = [
!     ('rtl/flx_sdl_run','bin/flx_sdl_run',[]),
    ]
    DRLIBS = [
--- 301,306 ----
  if HAVE_SDL:
    DRIVERS = [
!     ('static','rtl/flx_sdl_run','bin/flx_sdl_run',[]),
!     ('dynamic','rtl/flx_sdl_run','bin/flx_sdl_run',[]),
    ]
    DRLIBS = [