Changeset 20805

Show
Ignore:
Timestamp:
09/09/07 10:33:17 (1 year ago)
Author:
patrick
Message:

Added an fpc file for the Direct3D Draw Manager.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.2/build_windows.py

    r20803 r20805  
    827827   vrj_subst_vars['vrj_ldflags'] = r'/libpath:"$libdir"' 
    828828   vrj_subst_vars['vrj_libs'] = '' 
     829   vrj_subst_vars['vrj_d3d_lib'] = '' 
    829830   vrj_subst_vars['vrj_ogl_lib'] = '' 
    830831   vrj_subst_vars['vrj_pf_lib'] = '' 
     832   vrj_subst_vars['vrj_d3d_extra_libs'] = \ 
     833      'd3dxof.lib dxguid.lib d3dx9d.lib d3d9.lib winmm.lib' 
    831834   vrj_subst_vars['vrj_ogl_extra_libs'] = 'opengl32.lib glu32.lib' 
    832835   vrj_subst_vars['vrj_pf_extra_libs'] = \ 
    …… 
    843846                             'VRJ_VERSION', vrj_subst_vars, 
    844847                             [(r'vrj\vrjParam.h',), ('vrjuggler.fpc',), 
     848                              ('vrjuggler-direct3d.fpc',), 
    845849                              ('vrjuggler-opengl.fpc',), 
    846850                              ('vrjuggler-performer.fpc',), 
    …… 
    16201624   destdir = os.path.join(prefix, 'lib', 'flagpoll') 
    16211625   smartCopy(os.path.join(buildDir, 'VRJuggler', 'vrjuggler.fpc'), destdir) 
     1626   smartCopy(os.path.join(buildDir, 'VRJuggler', 'vrjuggler-direct3d.fpc'), 
     1627             destdir) 
    16221628   smartCopy(os.path.join(buildDir, 'VRJuggler', 'vrjuggler-opengl.fpc'), 
    16231629             destdir) 

  • juggler/branches/2.2/modules/vrjuggler/vrjuggler-direct3d.fpc.in

    • Property svn:eol-style set to native
    r20782 r20805  
    2121static_end = @APP_LINK_STATIC_OFF@ 
    2222 
    23 vrj_ogl_lib = @vrj_ogl_lib@ 
    24 vrj_ogl_prof_lib = @vrj_ogl_prof_lib@ 
    25 vrj_ogl_extra_libs = @vrj_ogl_extra_libs@ 
     23vrj_d3d_lib = @vrj_d3d_lib@ 
     24vrj_d3d_prof_lib = @vrj_d3d_prof_lib@ 
     25vrj_d3d_extra_libs = @vrj_d3d_extra_libs@ 
    2626 
    2727########################### Public Variables ############################ 
    2828 
    2929######################### Standard Flagpoll Variables ################### 
    30 Name: VR Juggler OpenGL Draw Manager 
    31 Description: Draw manager for applications that are based on OpenGL. 
     30Name: VR Juggler Direct3D Draw Manager 
     31Description: Draw Manager for applications that are based on Direct3D. 
    3232URL: http://www.vrjuggler.org/ 
    3333Version: ${vrj_version} 
    34 Provides: vrjuggler-opengl 
     34Provides: vrjuggler-direct3d 
    3535Requires: vrjuggler = ${vrj_version} 
    3636Arch: ${ISA} 
    3737Cflags: -I${includedir} 
    38 Libs: ${vrj_ldflags} ${vrj_ogl_lib} ${vrj_ogl_extra_libs} 
     38Libs: ${vrj_ldflags} ${vrj_d3d_lib} ${vrj_d3d_extra_libs} 
    3939Libs.private: 
    4040 
    …… 
    4242 
    4343# Draw Manager Choices 
    44 vrj_ogl_libs: ${vrj_ogl_lib} ${vrj_ogl_extra_libs} 
    45 vrj_ogl_prof_libs: ${vrj_ogl_prof_lib} ${vrj_ogl_extra_libs} 
     44vrj_d3d_libs: ${vrj_d3d_lib} ${vrj_d3d_extra_libs} 
     45vrj_d3d_prof_libs: ${vrj_d3d_prof_lib} ${vrj_d3d_extra_libs}