Changeset 119

Timestamp:

Dec 21, 2008, 9:45:37 PM (15 years ago)

Author:

mayuki

Message:

64bit環境で残念なことになっていたのをとりあえず回避。

Location:

trunk/MacFaceFloat

Files:

• IOptimusMini.cs (deleted)
• MacFaceApp.cs (modified) (2 diffs)
• MacFaceFloat.csproj (modified) (2 diffs)
• OptimusMini.cs (added)

trunk/MacFaceFloat/MacFaceApp.cs

@@ -130 +130 @@
                         }
 
-            //IOptimusMini.OnKeyDownCallbackDelegate oKD = new IOptimusMini.OnKeyDownCallbackDelegate(OnKeyDownCallbackHandler);
-            //IOptimusMini.OnDeviceStateChangedCallbackDelegate oDSC = new IOptimusMini.OnDeviceStateChangedCallbackDelegate(OnDeviceStateChangedCallbackHandler);
-            //IOptimusMini.RegisterEventHandler(oKD, oDSC);
+            //OptimusMini.OnKeyDownCallbackDelegate oKD = new OptimusMini.OnKeyDownCallbackDelegate(OnKeyDownCallbackHandler);
+            //OptimusMini.OnDeviceStateChangedCallbackDelegate oDSC = new OptimusMini.OnDeviceStateChangedCallbackDelegate(OnDeviceStateChangedCallbackHandler);
+            //OptimusMini.RegisterEventHandler(oKD, oDSC);
 
             patternWindow = null;
@@ -139 +139 @@
             InitializeComponent();
 
-            optimusMini = new IOptimusMini();
+            // x64 ŠÂ‹«‚Å 32bit ‚È OptimusMini.dll ‚ð“ǂݍž‚à‚¤‚Æ‚·‚é‚Æ“–‘RƒGƒ‰[‚Æ‚È‚é‚̂ʼn½‚à‚µ‚È‚¢ƒNƒ‰ƒX‚É‚µ‚Ä‚¨‚­
+                    optimusMini = (IntPtr.Size == 4 ? (IOptimusMini)new OptimusMini() : new OptimusMiniMock());
             optimusMini.DisplayOn();
 

trunk/MacFaceFloat/MacFaceFloat.csproj

@@ -102 +102 @@
     <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <BaseAddress>285212672</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <BaseAddress>285212672</BaseAddress>
+    <Optimize>true</Optimize>
+    <FileAlignment>4096</FileAlignment>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System">
@@ -150 +169 @@
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="IOptimusMini.cs">
+    <Compile Include="OptimusMini.cs">
       <SubType>Code</SubType>
     </Compile>