X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=README.win32;h=87247b11e3400a451098be976a247106e5b552df;hb=HEAD;hp=eca22db38134235891c1c78fe3709331727b1558;hpb=6b2cee6e3a99cbba15ee4861141571ff104491d0;p=freeglut

diff --git a/README.win32 b/README.win32
old mode 100755
new mode 100644
index eca22db..87247b1
--- a/README.win32
+++ b/README.win32
@@ -1,55 +1,8 @@
-Windows 32 Notes
-================
-
-The "freeglut" library installation package comes with MSVC 6.0 workspace and
-project files.  The workspace "freeglut.dsw" has two projects:
-"freeglut.dsp", which creates a DLL file, and "freeglut_static.dsp", which
-creates a static library.
-
-The "freeglut" library also comes with an Open Watcom compiler project file
-"freeglut.wpj" and two target files "freeglut.tgt" and "freeglut_static.tgt".
-The two target files build DLL and static libraries.  The Open Watcom also
-includes "freeglut.rc", which is a resource compiler script to add a "Version"
-tab to the DLL property sheet.
-
-
-Building the Libraries with MSVC
-================================
-
-To build the "freeglut" libraries, open MSVC and load the "freeglut" workspace.
-This will load the two projects.  Selecting "Build" - "Batch Build" from the
-menu will build both the debug and the release versions of both libraries.
-
-The libraries will be found in the following places and will have the
-following names:
-- DLL, debug version:       freeglut\freeglut\Debug\freeglut.lib
-- DLL, release version:     freeglut\freeglut\Release\freeglut.lib
-- Static, debug version:    freeglut\freeglut\DebugStatic\freeglut_static.lib
-- Static, release version:  freeglut\freeglut\ReleaseStatic\freeglut_static.lib
-
-Starting with VS2008, both 32bit and 64bit builds are available.
-These libraries can instead be found at:
-32bit:
-- DLL, debug version:       freeglut\freeglut\lib\x86\Debug\freeglut.lib
-                            freeglut\freeglut\lib\x86\Debug\freeglut.dll
-- Static, debug version:    freeglut\freeglut\lib\x86\Debug\freeglut_static.lib
-- DLL, release version:     freeglut\freeglut\lib\x86\freeglut.lib
-                            freeglut\freeglut\lib\x86\freeglut.dll
-- Static, release version:  freeglut\freeglut\lib\x86\freeglut_static.lib
-
-64bit:
-- DLL, debug version:       freeglut\freeglut\lib\x64\Debug\freeglut.lib
-                            freeglut\freeglut\lib\x64\Debug\freeglut.dll
-- Static, debug version:    freeglut\freeglut\lib\x64\Debug\freeglut_static.lib
-- DLL, release version:     freeglut\freeglut\lib\x64\freeglut.lib
-                            freeglut\freeglut\lib\x64\freeglut.dll
-- Static, release version:  freeglut\freeglut\lib\x64\freeglut_static.lib
-
-Unlike the *nix release, the library names are NOT automatic replacements for
-the GLUT library names.  You may rename them manually if you wish, but this is
-not necessary as the header file includes a pragma telling the compiler which
-library file to look for.
-
+NB
+==================================
+For ancient 16bit compatibility, windef.h (included through windows.h in
+freeglut_std.h) defines near and far. Its best to avoid using variables
+with these names in your own program.
 
 Installing the Libraries with MSVC
 ==================================
@@ -66,14 +19,18 @@ you will need to copy various files to various locations.
       files "gl.h", "glaux.h", and "glu.h".
     - The library file "freeglut.lib" or "freeglut_static.lib" (from the
       corresponding debug or release directory) needs to be copied into the
-      MSVC library directory.  This usually has a path similar to
-              "C:\Program Files\Microsoft Visual Studio\VC98\Lib"
+      MSVC library directory.  This usually has a path similar to:
+              "%ProgramFiles%\Microsoft SDKs\Windows\v7.0A\Lib" - x86 32 bits LIB's
+              "%ProgramFiles(x86)%\Microsoft SDKs\Windows\v7.0A\Lib" - x64 32 bits LIB's
+			  "%ProgramFiles(x86)%\Microsoft SDKs\Windows\v7.0A\Lib\x64" - x64 64 bits LIB's
       Note that there is no "GL" subdirectory here.  This directory should
       already have the files "opengl32.lib", "glu32.lib", and "glaux.lib".
     - If you are using the DLL version of "freeglut", the file "freeglut.dll"
       needs to be copied from the Debug or the Release directory into the
       DLL directory.  This usually has a path similar to
-              "C:\Windows\System32"
+              "%SystemRoot%\System32\" - x86 32 bits DLL's
+			  "%SystemRoot%\SysWOW64\" - x64 32 bits DLL's
+			  "%SystemRoot%\System32\" - x64 64 bits DLL's
       and will probably already have the files "opengl32.dll" and "glu32.dll".