Changeset 20331

Timestamp:

06/26/07 15:09:18 (1 year ago)

Author:

patrick

Message:

MFT r20312: Deal with inconsistent NSPR installstions on Windows where the

headers are sometimes in $(NSPR_ROOT)\include and sometimes in
$(NSPR_ROOT)\include\nspr.

This change also includes r20328, which should not have been a separate
revision on the trunk.

Files:

• juggler/branches/2.2/README-WINDOWS.html (modified) (1 diff)
• juggler/branches/2.2/build_windows.py (modified) (3 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/ApplicationDataManager/ApplicationDataManager.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/DTrack/DTrack.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/DataGlove/DataGlove.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/DirectXJoystick/DirectXJoystick.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/Ether24/Ether24.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/Fastrak/Fastrak.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/Flock/Flock.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/Gadgeteer.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/IBox/IBox.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/IS900/IS900.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/IntersenseAPI/IntersenseAPI.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/MSFTSpeechRecognition/MicrosoftSpeechRecognition.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/MotionStar/MotionStar.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/PinchGlove/PinchGlove.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/RemoteInputManager/RemoteInputManager.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/SerialEncoder/SerialEncoder.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/SpaceBall/SpaceBall.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/TrackdAPI/TrackdAPI.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/VRPN/VRPN.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/Wanda/Wanda.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Gadgeteer/X-IST/X-IST.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/JCCL/JCCL.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/JCCL/RTRC_Plugin_CXX/RTRC_Plugin_CXX.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Sonix/Audiere/Audiere.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Sonix/OpenAL/OpenAL.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Sonix/Sonix.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/Tweek_CXX/Tweek_CXX.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/VPR/VPR.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/VRJuggler/Direct3D_Draw_Manager/Direct3D_Draw_Manager.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/VRJuggler/OpenGL_Draw_Manager/OpenGL_Draw_Manager.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/VRJuggler/Performer_Draw_Manager/Performer_Draw_Manager.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/VRJuggler/VRJuggler.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc7/VRJugglerPlugins/Perf_Plugin_CXX/Perf_Plugin_CXX.vcproj (modified) (2 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/ApplicationDataManager/ApplicationDataManager.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/DTrack/DTrack.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/DataGlove/DataGlove.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/DirectXJoystick/DirectXJoystick.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/Ether24/Ether24.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/Fastrak/Fastrak.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/Flock/Flock.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/Gadgeteer.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/IBox/IBox.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/IS900/IS900.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/IntersenseAPI/IntersenseAPI.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/MSFTSpeechRecognition/MicrosoftSpeechRecognition.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/MotionStar/MotionStar.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/PinchGlove/PinchGlove.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/RemoteInputManager/RemoteInputManager.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/SerialEncoder/SerialEncoder.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/SpaceBall/SpaceBall.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/TrackdAPI/TrackdAPI.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/VRPN/VRPN.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/Wanda/Wanda.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/X-IST/X-IST.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/JCCL/JCCL.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/JCCL/RTRC_Plugin_CXX/RTRC_Plugin_CXX.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Sonix/Audiere/Audiere.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Sonix/OpenAL/OpenAL.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Sonix/Sonix.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/Tweek_CXX/Tweek_CXX.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/VPR/VPR.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/VRJuggler/Direct3D_Draw_Manager/Direct3D_Draw_Manager.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/VRJuggler/OpenGL_Draw_Manager/OpenGL_Draw_Manager.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/VRJuggler/Performer_Draw_Manager/Performer_Draw_Manager.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/VRJuggler/VRJuggler.vcproj (modified) (4 diffs)
• juggler/branches/2.2/vc8/VRJugglerPlugins/Perf_Plugin_CXX/Perf_Plugin_CXX.vcproj (modified) (4 diffs)

juggler/branches/2.2/README-WINDOWS.html

@@ -142 +142 @@
-    named <tt>include</tt>.
-  </dd>
+  <dt><tt>NSPR_INCLUDES</tt></dt>
+  <dd>
+    The directory containing the root of the NSPR header tree. For some NSPR
+    installations, the NSPR headers are in a subdirectory of
+    <tt>%NSPR_ROOT%\include</tt> named <tt>nspr</tt>. In that case, this
+    environment variable must be set to <tt>%NSPR_ROOT%\include\nspr</tt>.
+    Otherwise, it should be set to <tt>%NSPR_ROOT%\include</tt>.
+  </dd>
-  <dt><tt>CPPDOM_ROOT</tt></dt>
-  <dd>

juggler/branches/2.2/build_windows.py

@@ -234 +234 @@
-                               ''))
-   required.append(BuildOption('NSPR_ROOT', 'NSPR installation directory', ''))
+   required.append(BuildOption('NSPR_INCLUDES', 'Directory containing nspr.h',
+                               ''))
-   required.append(BuildOption('CPPDOM_ROOT', 'CppDOM installation directory',
-                               ''))
@@ -315 +317 @@
-         boost_ver = result
-         options['BOOST_INCLUDES'] = boost_dir + r'\include\boost-' + boost_ver
+
+      # The following is a little hack to get a reasonable default set for
+      # the NSPR_INCLUDES variable before the user has to enter it manually.
+      if opt.envVar == 'NSPR_ROOT' and \
+         options.get('NSPR_INCLUDES', '') == '':
+         options['NSPR_INCLUDES'] = os.path.join(result, 'include')
-
-      # The following is a little hack to get a reasonable default set for
@@ -1698 +1706 @@
-def installNSPR(prefix):
-   simpleInstall('NSPR headers and libraries', os.environ['NSPR_ROOT'],
-
+, os.environ['NSPR_INCLUDES']
-
-def installCppDOM(prefix):

juggler/branches/2.2/vc7/Gadgeteer/ApplicationDataManager/ApplicationDataManager.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_CLUSTER_PLUGIN_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_CLUSTER_PLUGIN_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/DTrack/DTrack.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/DataGlove/DataGlove.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/DirectXJoystick/DirectXJoystick.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/Ether24/Ether24.vcproj

@@ -21 +21 @@
-                                AdditionalOptions="/Zm800"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -81 +81 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/Fastrak/Fastrak.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/Flock/Flock.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/Gadgeteer.vcproj

@@ -21 +21 @@
-                                AdditionalOptions="/Zm800"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_BUILD_;GADGET_ROOT_DIR=\"$(instprefix)\""
-                                MinimalRebuild="FALSE"
@@ -81 +81 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;BOOST_ALL_DYN_LINK;WIN32;NDEBUG;_CONSOLE;_USRDLL;_GADGET_BUILD_;_OPT;GADGET_ROOT_DIR=\"$(instprefix)\""
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/IBox/IBox.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/IS900/IS900.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/IntersenseAPI/IntersenseAPI.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/MSFTSpeechRecognition/MicrosoftSpeechRecognition.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/MotionStar/MotionStar.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/PinchGlove/PinchGlove.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/RemoteInputManager/RemoteInputManager.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_CLUSTER_PLUGIN_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_CLUSTER_PLUGIN_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/SerialEncoder/SerialEncoder.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                StringPooling="TRUE"

juggler/branches/2.2/vc7/Gadgeteer/SpaceBall/SpaceBall.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-ROOT)\include
+INCLUDES)
-                                PreprocessorDefinitions="BOOST_ALL_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_DRIVER_BUILD_"
-                                MinimalRebuild="FALSE"
@@ -79 +79 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-ROOT)\include