Changeset 19212

Timestamp:

08/15/06 15:57:58 (2 years ago)

Author:

patrick

Message:

Add needed compiler flags (/EHsc and /GR) to generated .fpc files as well
as needed linker input files.

Files:

• juggler/trunk/build_windows.py (modified) (6 diffs)

juggler/trunk/build_windows.py

@@ -579 +579 @@
-
-   vpr_subst_vars = {}
+   vpr_subst_vars['vpr_cxxflags'] = '/EHsc /GR'
-   vpr_subst_vars['vpr_ldflags_compiler'] = r'/link /libpath:$libdir'
-   vpr_subst_vars['vpr_ldflags_linker'] = r'/libpath:$libdir'
-   vpr_subst_vars['vpr_libs'] = ''
+   vpr_subst_vars['vpr_extra_ldflags_linker'] = r'/libpath:${VJ_DEPS_DIR}\lib'
+   vpr_subst_vars['vpr_extra_libs'] = 'libnspr4.lib libplc4.lib'
-   mods.append(JugglerModule(r'modules\vapor', vcDir, 'VPR', 'VPR_VERSION',
-                             vpr_subst_vars,
@@ -603 +606 @@
-
-   tweek_subst_vars = {}
+   tweek_subst_vars['tweek_cxxflags'] = '/EHsc /GR'
-   if tweek_have_cxx:
-= '
++= ' 
-   tweek_subst_vars['tweek_ldflags_compiler'] = r'/link /libpath:$libdir'
-   tweek_subst_vars['tweek_ldflags_linker'] = r'/libpath:$libdir'
-   tweek_subst_vars['tweek_libs'] = ''
+   tweek_subst_vars['tweek_extra_ldflags'] = r'/libpath:${VJ_DEPS_DIR}\lib'
+   tweek_subst_vars['tweek_extra_libs'] = \
+      'omnithread%s_rt.lib omniORB%s_rt.lib omniDynamic%s_rt.lib' % \
+         (os.environ['OMNITHREAD_VERSION'], os.environ['OMNIORB_VERSION'],
+          os.environ['OMNIORB_VERSION'])
-   tweek_subst_vars['tweek_idlflags_java'] = r'-I$prefix\include'
-   tweek_subst_vars['tweek_idlflags_cxx'] = r'-bcxx -Wbh=.h,s=.cpp -I$prefix\include'
@@ -641 +650 @@
-
-   jccl_subst_vars = {}
+   jccl_subst_vars['jccl_cxxflags'] = '/EHsc /GR'
-   jccl_subst_vars['jccl_ldflags_compiler'] = r'/link /libpath:$libdir'
-   jccl_subst_vars['jccl_ldflags_linker'] = r'/libpath:$libdir'
@@ -658 +668 @@
-
-   snx_subst_vars = {}
+   snx_subst_vars['snx_cxxflags'] = '/EHsc /GR'
-   snx_subst_vars['snx_ldflags_compiler'] = r'/link /libpath:$libdir'
-   snx_subst_vars['snx_ldflags_linker'] = r'/libpath:$libdir'
@@ -668 +679 @@
-
-   gadget_subst_vars = {}
+   gadget_subst_vars['gadget_cxxflags'] = '/EHsc /GR'
-   gadget_subst_vars['gadget_ldflags_compiler'] = r'/link /libpath:$libdir'
-   gadget_subst_vars['gadget_ldflags_linker'] = r'/libpath:$libdir'
-   gadget_subst_vars['gadget_libs'] = ''
+   gadget_subst_vars['gadget_extra_libs'] = \
+      'comctl32.lib ws2_32.lib user32.lib'
-   mods.append(JugglerModule(r'modules\gadgeteer', vcDir, 'Gadgeteer',
-                             'GADGET_VERSION', gadget_subst_vars,
@@ -678 +692 @@
-
-   vrj_subst_vars = {}
+   vrj_subst_vars['vrj_cxxflags'] = '/EHsc /GR'
-   vrj_subst_vars['vrj_ldflags_compiler'] = r'/link /libpath:$libdir'
-   vrj_subst_vars['vrj_ldflags_linker'] = r'/libpath:$libdir'
-   vrj_subst_vars['vrj_libs'] = ''
+   vrj_subst_vars['vrj_ogl_extra_libs'] = 'opengl32.lib glu32.lib'
+   vrj_subst_vars['vrj_pf_extra_libs'] = \
+      '/libpath:${PFROOT}\lib libpf.lib libpfdu-util.lib libpfui.lib opengl32.lib glu32.lib'
-   mods.append(JugglerModule(r'modules\vrjuggler', vcDir, 'VRJuggler',
-                             'VRJ_VERSION', vrj_subst_vars,