diff --git a/source/vc6/ps.dsp b/source/vc6/ps.dsp index db369ce5b0..ac204ced74 100755 --- a/source/vc6/ps.dsp +++ b/source/vc6/ps.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\lib" /I "d:\apps\xerces-c_2_3_0-win32\include\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\lib" /I "d:\apps\xerces-c_2_3_0-win32\include\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -183,6 +183,74 @@ SOURCE=..\terrain\Vector3D.h # Begin Group "gui" # PROP Default_Filter "" +# Begin Source File + +SOURCE=..\gui\CButton.cpp +# End Source File +# Begin Source File + +SOURCE=..\gui\CButton.h +# End Source File +# Begin Source File + +SOURCE=..\gui\CGUI.cpp +# End Source File +# Begin Source File + +SOURCE=..\gui\CGUI.h +# End Source File +# Begin Source File + +SOURCE=..\gui\CGUIButtonBehavior.cpp +# End Source File +# Begin Source File + +SOURCE=..\gui\CGUIButtonBehavior.h +# End Source File +# Begin Source File + +SOURCE=..\gui\CGUIObject.cpp +# End Source File +# Begin Source File + +SOURCE=..\gui\CGUIObject.h +# End Source File +# Begin Source File + +SOURCE=..\gui\CGUISettingsObject.cpp +# End Source File +# Begin Source File + +SOURCE=..\gui\CGUISettingsObject.h +# End Source File +# Begin Source File + +SOURCE=..\gui\CGUISprite.cpp +# End Source File +# Begin Source File + +SOURCE=..\gui\CGUISprite.h +# End Source File +# Begin Source File + +SOURCE=..\gui\GUI.cpp +# End Source File +# Begin Source File + +SOURCE=..\gui\GUI.h +# End Source File +# Begin Source File + +SOURCE=..\gui\guimain.cpp +# End Source File +# Begin Source File + +SOURCE=..\gui\XercesErrorHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\gui\XercesErrorHandler.h +# End Source File # End Group # Begin Group "lib" diff --git a/source/vc6/ps.opt b/source/vc6/ps.opt index 90fdd61fd6..cb47955d27 100755 Binary files a/source/vc6/ps.opt and b/source/vc6/ps.opt differ diff --git a/source/vc6/readme.txt b/source/vc6/readme.txt index 6fa8e9e948..e4228990f5 100755 --- a/source/vc6/readme.txt +++ b/source/vc6/readme.txt @@ -1,38 +1,25 @@ -Workspace settings for VC6: -________________________________________________________________________________ +VC6 workspace -Compiler settings: -- set code generation to multithreaded (+debug if desired) -- set entry point to entry -________________________________________________________________________________ +TODO: -Includes: -- download http://oss.sgi.com/projects/ogl-sample/ABI/glext.h ; +- get latest glext.h: + download from http://oss.sgi.com/projects/ogl-sample/ABI/glext.h ; put it in GL subdir of compiler's include dir -- add dir containing tex.h etc. to the compiler's include path -________________________________________________________________________________ -Xerces (required for the GUI, which can be omitted ATM) +- install ZLib: + download from http://www.stud.uni-karlsruhe.de/~urkt/zlib.zip ; + put the DLL in binaries\, put header and lib into compiler dirs + Note: this is version 1.1.4.8751 -download Xerces binary from http://xml.apache.org/xerces-c/download.cgi ; -put the DLL in bin in your system dir, or in the game's dir; -add its include dir to the compiler's include path -________________________________________________________________________________ +- omit GUI folder (not necessary ATM) +OR +- install Xerces: + download Xerces binary from http://xml.apache.org/xerces-c/download.cgi ; + put the DLL in binaries\, add the include dir to the compiler's include path -ZLib - -download from http://www.stud.uni-karlsruhe.de/~urkt/zlib.zip ; -put the DLL in the game's dir, and the headers/lib in the appropriate compiler -dirs. -Note: another version of ZLib will probably do, but best to use this one, to -avoid conflicts (v1.1.4.8751). -________________________________________________________________________________ -Files to leave out, as they aren't necessary ATM, and require compiler support: -- debug* (requires dbghelp, included with VC7) -- memcpy.cpp (requires VC6 processor pack) -________________________________________________________________________________ +NOTE: important workspace settings (already set) -NB: earlier steps that are now unnecessary: -- adding .lib files - now taken care of by the code, via #pragma comment(lib -- installing DX7 SDK - detect code now uses stock Win32 and DX3 calls \ No newline at end of file +- code generation = multithreaded [debug] +- entry point = entry +- add lib\ to include path \ No newline at end of file diff --git a/source/vc7/ps.suo b/source/vc7/ps.suo index 488439e0df..f33c544ce4 100755 Binary files a/source/vc7/ps.suo and b/source/vc7/ps.suo differ diff --git a/source/vc7/readme.txt b/source/vc7/readme.txt index 386a35bc4c..0a196ff583 100755 --- a/source/vc7/readme.txt +++ b/source/vc7/readme.txt @@ -1,33 +1,25 @@ -Workspace settings for VC7.1 (2003) with Intel compiler 7.1: -________________________________________________________________________________ +VC7.1 (2003) workspace, for Intel compiler 7.1 -Compiler settings: -- set code generation to multithreaded (+debug if desired) -- set entry point to entry -________________________________________________________________________________ +TODO: -Includes: -- download http://oss.sgi.com/projects/ogl-sample/ABI/glext.h ; +- get latest glext.h: + download from http://oss.sgi.com/projects/ogl-sample/ABI/glext.h ; put it in GL subdir of compiler's include dir -- add dir containing tex.h etc. to the compiler's include path -________________________________________________________________________________ -Xerces (required for the GUI, which can be omitted ATM) +- install ZLib: + download from http://www.stud.uni-karlsruhe.de/~urkt/zlib.zip ; + put the DLL in binaries\, put header and lib into compiler dirs + Note: this is version 1.1.4.8751 -download Xerces binary from http://xml.apache.org/xerces-c/download.cgi ; -put the DLL in bin in your system dir, or in the game's dir; -add its include dir to the compiler's include path -________________________________________________________________________________ +- omit GUI folder (not necessary ATM) +OR +- install Xerces: + download Xerces binary from http://xml.apache.org/xerces-c/download.cgi ; + put the DLL in binaries\, add the include dir to the compiler's include path -ZLib - -download from http://www.stud.uni-karlsruhe.de/~urkt/zlib.zip ; -put the DLL in the game's dir, and the headers/lib in the appropriate compiler -dirs. -Note: another version of ZLib will probably do, but best to use this one, to -avoid conflicts (v1.1.4.8751). -________________________________________________________________________________ -NB: earlier steps that are now unnecessary: -- adding .lib files - now taken care of by the code, via #pragma comment(lib -- installing DX7 SDK - detect code now uses stock Win32 and DX3 calls \ No newline at end of file +NOTE: important workspace settings (already set) + +- code generation = multithreaded [debug] +- entry point = entry +- add lib\ to include path \ No newline at end of file