Tutorial should work for both x86_64 and i686 on Windows now

bombless · Jan 25, 2015 · 2e90854 · 2e90854
1 parent 2a6b2e5
commit 2e90854
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 Cargo.lock
 sample_project/*.dll
-target/*
+sample_project/target/*
diff --git a/README.md b/README.md
@@ -40,9 +40,12 @@ Unfortunately, Windows is the toughest platform to develop on. The Windows versi
 
 Luckily for you crazy kids, C has a stable ABI, so you can simply plug in the binaries I have produced!
 
-Copy the \*.a files in the `$TUTORIAL_ROOT/windows_clibs` folder to `$RUST_ROOT\bin\rustlib\$CPU_ARCH-pc-windows-gnu\lib`, which is most likely `C:\Rust\bin\rustlib\x86_64-pc-windows-gnu\lib` on your machine.
+Copy the \*.a files in the `$TUTORIAL_ROOT/windows_clibs/$CPU_ARCH` folder to `$RUST_ROOT\bin\rustlib\$CPU_ARCH-pc-windows-gnu\lib`, which is most likely one of the following:
 
-Copy the \*.dll files in `$TUTORIAL_ROOT/windows_clibs` to `$TUTORIAL_ROOT/sample_project`.
+`C:\Rust\bin\rustlib\x86_64-pc-windows-gnu\lib`
+`C:\Rust\bin\rustlib\i686-pc-windows-gnu\lib`
+
+Copy the \*.dll files in `$TUTORIAL_ROOT/windows_clibs/$CPU_ARCH` to `$TUTORIAL_ROOT/sample_project`.
 
 
 ### Installing SDL2 and FreeType on Linux

diff --git a/windows_clibs/i686/SDL2.dll b/windows_clibs/i686/SDL2.dll
diff --git a/windows_clibs/i686/libSDL2.dll.a b/windows_clibs/i686/libSDL2.dll.a
diff --git a/windows_clibs/i686/libfreetype-6.a b/windows_clibs/i686/libfreetype-6.a
diff --git a/windows_clibs/libfreetype-6.dll b/windows_clibs/libfreetype-6.dll
diff --git a/windows_clibs/SDL2.dll → windows_clibs/x86_64/SDL2.dll b/windows_clibs/SDL2.dll → windows_clibs/x86_64/SDL2.dll
diff --git a/windows_clibs/libSDL2.dll.a → windows_clibs/x86_64/libSDL2.dll.a b/windows_clibs/libSDL2.dll.a → windows_clibs/x86_64/libSDL2.dll.a
diff --git a/windows_clibs/libfreetype-6.a → windows_clibs/x86_64/libfreetype-6.a b/windows_clibs/libfreetype-6.a → windows_clibs/x86_64/libfreetype-6.a