adapt windows project

diff --git a/bin/windows/moflib.lib b/bin/windows/moflib.lib
new file mode 100644 (file)
index 0000000..2c6470c
Binary files /dev/null and b/bin/windows/moflib.lib differ

diff --git a/build/windows/Debug/numeric.exe b/bin/windows/numeric.exe
similarity index 95%
rename from build/windows/Debug/numeric.exe
rename to bin/windows/numeric.exe
index dbd351e..93045e1 100644 (file)
Binary files a/build/windows/Debug/numeric.exe and b/bin/windows/numeric.exe differ

diff --git a/build/windows/Debug/moflib.lib b/build/windows/Debug/moflib.lib
deleted file mode 100644 (file)
index a63e7aa..0000000
Binary files a/build/windows/Debug/moflib.lib and /dev/null differ

diff --git a/build/windows/moflib.ncb b/build/windows/moflib.ncb
index 354b1df..2640017 100644 (file)
Binary files a/build/windows/moflib.ncb and b/build/windows/moflib.ncb differ

diff --git a/build/windows/moflib.sln b/build/windows/moflib.sln
index eaebd3e..c66c865 100644 (file)
--- a/build/windows/moflib.sln
+++ b/build/windows/moflib.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moflib", "src/moflib.vcproj", "{1487ACC6-5925-4307-A04F-6EA70E13C806}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moflib", "..\..\src\windows\moflib.vcproj", "{1487ACC6-5925-4307-A04F-6EA70E13C806}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "numeric", "sample\numeric\numeric.vcproj", "{C65168E8-48C5-4E1B-8F3B-137BCFF4A945}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "numeric", "..\..\sample\numeric\windows\numeric.vcproj", "{C65168E8-48C5-4E1B-8F3B-137BCFF4A945}"
        ProjectSection(ProjectDependencies) = postProject
                {1487ACC6-5925-4307-A04F-6EA70E13C806} = {1487ACC6-5925-4307-A04F-6EA70E13C806}
        EndProjectSection

diff --git a/build/windows/moflib.suo b/build/windows/moflib.suo
index b22efce..917a0bd 100644 (file)
Binary files a/build/windows/moflib.suo and b/build/windows/moflib.suo differ

diff --git a/sample/numeric/windows/Debug/BuildLog.htm b/sample/numeric/windows/Debug/BuildLog.htm
index b5c3101..0922af8 100644 (file)
Binary files a/sample/numeric/windows/Debug/BuildLog.htm and b/sample/numeric/windows/Debug/BuildLog.htm differ

diff --git a/sample/numeric/windows/Debug/main.obj b/sample/numeric/windows/Debug/main.obj
index bb73a58..39e0d02 100644 (file)
Binary files a/sample/numeric/windows/Debug/main.obj and b/sample/numeric/windows/Debug/main.obj differ

diff --git a/sample/numeric/windows/Debug/mt.dep b/sample/numeric/windows/Debug/mt.dep
index dee7a7d..34c2811 100644 (file)
--- a/sample/numeric/windows/Debug/mt.dep
+++ b/sample/numeric/windows/Debug/mt.dep
@@ -1 +1 @@
-\83}\83j\83t\83F\83X\83g \83\8a\83\\81[\83X\82Ì\8dÅ\8fI\8dX\90V\93ú\8e\9e: 18:05:30.78 (2010/04/22) 
+\83}\83j\83t\83F\83X\83g \83\8a\83\\81[\83X\82Ì\8dÅ\8fI\8dX\90V\93ú\8e\9e: 19:14:32.09 (2010/04/25) 

diff --git a/sample/numeric/windows/Debug/numeric.exe b/sample/numeric/windows/Debug/numeric.exe
new file mode 100644 (file)
index 0000000..93045e1
Binary files /dev/null and b/sample/numeric/windows/Debug/numeric.exe differ

diff --git a/build/windows/Debug/numeric.ilk b/sample/numeric/windows/Debug/numeric.ilk
similarity index 58%
rename from build/windows/Debug/numeric.ilk
rename to sample/numeric/windows/Debug/numeric.ilk
index fc08c23..2c5e292 100644 (file)
Binary files a/build/windows/Debug/numeric.ilk and b/sample/numeric/windows/Debug/numeric.ilk differ

diff --git a/build/windows/Debug/numeric.pdb b/sample/numeric/windows/Debug/numeric.pdb
similarity index 83%
rename from build/windows/Debug/numeric.pdb
rename to sample/numeric/windows/Debug/numeric.pdb
index b0e954e..88cbb92 100644 (file)
Binary files a/build/windows/Debug/numeric.pdb and b/sample/numeric/windows/Debug/numeric.pdb differ

diff --git a/sample/numeric/windows/Debug/vc90.idb b/sample/numeric/windows/Debug/vc90.idb
index 606289a..b5c7fd4 100644 (file)
Binary files a/sample/numeric/windows/Debug/vc90.idb and b/sample/numeric/windows/Debug/vc90.idb differ

diff --git a/sample/numeric/windows/Debug/vc90.pdb b/sample/numeric/windows/Debug/vc90.pdb
index 2c1f3af..f50ecc7 100644 (file)
Binary files a/sample/numeric/windows/Debug/vc90.pdb and b/sample/numeric/windows/Debug/vc90.pdb differ

diff --git a/sample/numeric/windows/numeric.ncb b/sample/numeric/windows/numeric.ncb
new file mode 100644 (file)
index 0000000..c250cc1
Binary files /dev/null and b/sample/numeric/windows/numeric.ncb differ

diff --git a/sample/numeric/windows/numeric.suo b/sample/numeric/windows/numeric.suo
new file mode 100644 (file)
index 0000000..8ab99fa
Binary files /dev/null and b/sample/numeric/windows/numeric.suo differ

diff --git a/sample/numeric/windows/numeric.vcproj b/sample/numeric/windows/numeric.vcproj
index 5a375d2..806355d 100644 (file)
--- a/sample/numeric/windows/numeric.vcproj
+++ b/sample/numeric/windows/numeric.vcproj
@@ -17,10 +17,10 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
+                       OutputDirectory=".\Debug"
+                       IntermediateDirectory=".\Debug"
                        ConfigurationType="1"
-                       CharacterSet="2"
+                       CharacterSet="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="$(SolutionDir)/src"
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)/../../src&quot;"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -58,6 +58,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalDependencies="moflib.lib"
+                               AdditionalLibraryDirectories="..\..\..\bin\windows\"
                                GenerateDebugInformation="true"
                                TargetMachine="1"
                        />
@@ -81,6 +83,8 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               Description="bin\82É\83R\83s\81["
+                               CommandLine="copy $(OutDir)\numeric.exe ..\..\..\bin\windows"
                        />
                </Configuration>
                <Configuration
@@ -163,7 +167,7 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                        <File
-                               RelativePath=".\main.cpp"
+                               RelativePath="..\main.cpp"
                                >
                        </File>
                </Filter>

diff --git a/src/windows/Debug/BuildLog.htm b/src/windows/Debug/BuildLog.htm
index 85b3016..1147476 100644 (file)
Binary files a/src/windows/Debug/BuildLog.htm and b/src/windows/Debug/BuildLog.htm differ

diff --git a/src/windows/Debug/dummy.obj b/src/windows/Debug/dummy.obj
index a34b1ec..d633e89 100644 (file)
Binary files a/src/windows/Debug/dummy.obj and b/src/windows/Debug/dummy.obj differ

diff --git a/src/windows/Debug/moflib.lib b/src/windows/Debug/moflib.lib
new file mode 100644 (file)
index 0000000..2c6470c
Binary files /dev/null and b/src/windows/Debug/moflib.lib differ

diff --git a/src/windows/Debug/vc90.idb b/src/windows/Debug/vc90.idb
index b6b80aa..b1cc35e 100644 (file)
Binary files a/src/windows/Debug/vc90.idb and b/src/windows/Debug/vc90.idb differ

diff --git a/src/windows/Debug/vc90.pdb b/src/windows/Debug/vc90.pdb
index 99614fa..209cc18 100644 (file)
Binary files a/src/windows/Debug/vc90.pdb and b/src/windows/Debug/vc90.pdb differ

diff --git a/src/windows/moflib.ncb b/src/windows/moflib.ncb
index 069cc2a..1b8d44f 100644 (file)
Binary files a/src/windows/moflib.ncb and b/src/windows/moflib.ncb differ

diff --git a/src/windows/moflib.suo b/src/windows/moflib.suo
index 6c0162f..3b32529 100644 (file)
Binary files a/src/windows/moflib.suo and b/src/windows/moflib.suo differ

diff --git a/src/windows/moflib.vcproj b/src/windows/moflib.vcproj
index aa44423..53ddaf9 100644 (file)
--- a/src/windows/moflib.vcproj
+++ b/src/windows/moflib.vcproj
@@ -17,8 +17,8 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
+                       OutputDirectory=".\Debug"
+                       IntermediateDirectory=".\Debug"
                        ConfigurationType="4"
                        CharacterSet="1"
                        >
@@ -43,7 +43,7 @@
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                DebugInformationFormat="4"
                        />
                        <Tool
@@ -72,6 +72,8 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               Description="bin\82É\83R\83s\81["
+                               CommandLine="copy $(OutDir)\moflib.lib  ..\..\bin\windows"
                        />
                </Configuration>
                <Configuration
@@ -154,7 +156,7 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                        <File
-                               RelativePath=".\mof\dummy.cpp"
+                               RelativePath="..\mof\dummy.cpp"
                                >
                        </File>
                </Filter>
@@ -167,23 +169,23 @@
                                Name="math"
                                >
                                <File
-                                       RelativePath="mof\math\basic_vector.hpp"
+                                       RelativePath="..\mof\math\basic_vector.hpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="mof\math\vector.hpp"
+                                       RelativePath="..\mof\math\vector.hpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="mof\math\vector2.hpp"
+                                       RelativePath="..\mof\math\vector2.hpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="mof\math\vector3.hpp"
+                                       RelativePath="..\mof\math\vector3.hpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="mof\math\vector4.hpp"
+                                       RelativePath="..\mof\math\vector4.hpp"
                                        >
                                </File>
                        </Filter>
@@ -191,11 +193,11 @@
                                Name="base"
                                >
                                <File
-                                       RelativePath="mof\base\mofdef.hpp"
+                                       RelativePath="..\mof\base\mofdef.hpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="mof\base\tstring.hpp"
+                                       RelativePath="..\mof\base\tstring.hpp"
                                        >
                                </File>
                        </Filter>
@@ -203,7 +205,7 @@
                                Name="util"
                                >
                                <File
-                                       RelativePath="mof\util\foreach.hpp"
+                                       RelativePath="..\mof\util\foreach.hpp"
                                        >
                                </File>
                        </Filter>