From 3884920ebd66e692f263cb7654ecb65fa4341009 Mon Sep 17 00:00:00 2001 From: janwas Date: Tue, 4 Nov 2003 22:54:48 +0000 Subject: [PATCH] no message This was SVN commit r21. --- source/vc6/ps.dsp | 72 ++++++++++++++++++++++++++++++++++++++++-- source/vc6/ps.opt | Bin 49664 -> 53760 bytes source/vc6/readme.txt | 47 ++++++++++----------------- source/vc7/ps.suo | Bin 7680 -> 8192 bytes source/vc7/readme.txt | 44 +++++++++++--------------- 5 files changed, 105 insertions(+), 58 deletions(-) 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 90fdd61fd66f3e1094438604e67dd2d9c4d15c39..cb47955d27068f7d94a720fc04669dc96a3d917a 100755 GIT binary patch literal 53760 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 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 488439e0df2df5a3780eb8695f01ab814e7febd1..f33c544ce4d1ed642b085128f0ad0452ae800159 100755 GIT binary patch delta 399 zcmZp$X>izJz{JS6S(oWN<0KXzMz+a{Eb_bt+l6G579VD0W?*1&m|V%?&%pv@{Re`{ zf*cx?f3Te9WfTC4u){!wI#3z?<`}2a$=Rg+y!W}aC1h>xQ5+47_&H{#$zwiX`fE>Yxtf+)HfJY1{z=R~Y z`3tW<(`08>!^tHA0X$ql86G6r$qhm*n|}y+v+^SRxa`0SYvb36nvA@