Changeset 19226

Show
Ignore:
Timestamp:
08/17/06 14:15:39 (2 years ago)
Author:
patrick
Message:

Do not try to pull omniORB-related environment variables from os.environ
if omniORB isn't being used.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/build_windows.py

    r19213 r19226  
    609609   if tweek_have_cxx: 
    610610      tweek_subst_vars['tweek_cxxflags'] += ' /DTWEEK_HAVE_CXX /D__WIN32__=1 /D__x86__=1 /D__NT__=1 /D__OSVERSION__=5 /DUSE_core_stub_in_nt_dll /DUSE_core_stub_in_nt_dll_NOT_DEFINED_Subject /I$prefix\\include\\tweek\\idl' 
     611      tweek_subst_vars['tweek_extra_libs'] = \ 
     612         'omnithread%s_rt.lib omniORB%s_rt.lib omniDynamic%s_rt.lib' % \ 
     613            (os.environ['OMNITHREAD_VERSION'], os.environ['OMNIORB_VERSION'], 
     614             os.environ['OMNIORB_VERSION']) 
     615 
    611616   tweek_subst_vars['tweek_ldflags_compiler'] = r'/link /libpath:$libdir' 
    612617   tweek_subst_vars['tweek_ldflags_linker'] = r'/libpath:$libdir' 
    613618   tweek_subst_vars['tweek_libs'] = '' 
    614619   tweek_subst_vars['tweek_extra_ldflags'] = r'/libpath:${VJ_DEPS_DIR}\lib' 
    615    tweek_subst_vars['tweek_extra_libs'] = \ 
    616       'omnithread%s_rt.lib omniORB%s_rt.lib omniDynamic%s_rt.lib' % \ 
    617          (os.environ['OMNITHREAD_VERSION'], os.environ['OMNIORB_VERSION'], 
    618           os.environ['OMNIORB_VERSION']) 
    619620   tweek_subst_vars['tweek_idlflags_java'] = r'-I$prefix\include' 
    620621   tweek_subst_vars['tweek_idlflags_cxx'] = r'-bcxx -Wbh=.h,s=.cpp -I$prefix\include'