diff --git a/.gitattributes b/.gitattributes index 3da2819..3b8a251 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,6 @@ # Force CRLF for Windows files: *.dsp text eol=crlf +*.dsw text eol=crlf +*.sln text eol=crlf *.vcxproj text eol=crlf *.vcxproj.filters text eol=crlf -*.sln text eol=crlf diff --git a/common/qfont.h b/common/qfont.h index d6bbb87..2fc8129 100644 --- a/common/qfont.h +++ b/common/qfont.h @@ -21,7 +21,7 @@ // Font stuff #define NUM_GLYPHS 256 -#include "basetypes.h" +// does not exist: // #include "basetypes.h" typedef struct { @@ -35,7 +35,7 @@ typedef struct qfont_s int rowcount; int rowheight; charinfo fontinfo[ NUM_GLYPHS ]; - byte data[4]; + unsigned char data[4]; } qfont_t; #endif // qfont.h diff --git a/projects/readme.txt b/projects/readme.txt index 0752e05..8ed9bec 100644 --- a/projects/readme.txt +++ b/projects/readme.txt @@ -2,13 +2,13 @@ Directory Contents ================== vs2010 - Contains .vcxproj for building valve, dmc and ricochet dlls with - Visual C++ 2010 Express - + Contains Visual C++ 2010 Express project and solution files. + Please read readme.txt included in that folder for further instructions. + Other notes =========== -MSVC++ 6.0 .dsp files can be found in the appropiate folders. +MSVC++ 6.0 .dsp files can be found in the appropriate folders. Linux Makefiles can be found in ../linux/ diff --git a/projects/vs2010/bspinfo.vcxproj b/projects/vs2010/bspinfo.vcxproj new file mode 100644 index 0000000..0bbbfef --- /dev/null +++ b/projects/vs2010/bspinfo.vcxproj @@ -0,0 +1,96 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {B1227C36-C02C-4914-9675-C6D243D8B36E} + Win32Proj + bspinfo + + + + Application + true + NotSet + + + Application + false + true + NotSet + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + true + true + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/projects/vs2010/bspinfo.vcxproj.filters b/projects/vs2010/bspinfo.vcxproj.filters new file mode 100644 index 0000000..9b04226 --- /dev/null +++ b/projects/vs2010/bspinfo.vcxproj.filters @@ -0,0 +1,57 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {63245e01-3884-4650-b2a4-90c672eb89e9} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + {9e2cd4d4-3990-41a2-ae01-1cdcaeb123b2} + + + + + Source Files\utils\bspinfo + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + \ No newline at end of file diff --git a/projects/vs2010/light.vcxproj b/projects/vs2010/light.vcxproj new file mode 100644 index 0000000..d74adf4 --- /dev/null +++ b/projects/vs2010/light.vcxproj @@ -0,0 +1,98 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + {1D9A402B-C7AB-4DAA-AD3F-42195F283E64} + Win32Proj + bspinfo + + + + Application + true + NotSet + + + Application + false + true + NotSet + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/projects/vs2010/light.vcxproj.filters b/projects/vs2010/light.vcxproj.filters new file mode 100644 index 0000000..a261a41 --- /dev/null +++ b/projects/vs2010/light.vcxproj.filters @@ -0,0 +1,63 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {9e2cd4d4-3990-41a2-ae01-1cdcaeb123b2} + + + {63245e01-3884-4650-b2a4-90c672eb89e9} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\light + + + Source Files\utils\light + + + Source Files\utils\light + + + + + Header Files\utils\light + + + \ No newline at end of file diff --git a/projects/vs2010/makefont.vcxproj b/projects/vs2010/makefont.vcxproj new file mode 100644 index 0000000..e5258b8 --- /dev/null +++ b/projects/vs2010/makefont.vcxproj @@ -0,0 +1,108 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + {C47ACACA-7DA4-4741-A287-9215309949E7} + Win32Proj + bspinfo + + + + Application + true + MultiByte + + + Application + false + true + MultiByte + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../common;../../utils/common + + + Console + true + winmm.lib;%(AdditionalDependencies) + + + xcopy $(TargetPath) ..\..\..\valve /r /i + + + Copyint to valve\ + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../common;../../utils/common + + + Console + true + true + true + winmm.lib;%(AdditionalDependencies) + + + xcopy $(TargetPath) ..\..\..\valve /r /i + + + Copyint to valve\ + + + + + + \ No newline at end of file diff --git a/projects/vs2010/makefont.vcxproj.filters b/projects/vs2010/makefont.vcxproj.filters new file mode 100644 index 0000000..3849f41 --- /dev/null +++ b/projects/vs2010/makefont.vcxproj.filters @@ -0,0 +1,51 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + {9e2cd4d4-3990-41a2-ae01-1cdcaeb123b2} + + + {673592e5-697a-4bb6-b06b-8104dcc2c470} + + + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\makefont + + + + + Header Files\utils\common + + + Header Files\utils\common + + + \ No newline at end of file diff --git a/projects/vs2010/makels.vcxproj b/projects/vs2010/makels.vcxproj new file mode 100644 index 0000000..54ef3df --- /dev/null +++ b/projects/vs2010/makels.vcxproj @@ -0,0 +1,90 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + {8D9315B8-D428-411B-A60F-6AFD3CE0A687} + Win32Proj + bspinfo + + + + Application + true + NotSet + + + Application + false + true + NotSet + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/projects/vs2010/makels.vcxproj.filters b/projects/vs2010/makels.vcxproj.filters new file mode 100644 index 0000000..f14a57b --- /dev/null +++ b/projects/vs2010/makels.vcxproj.filters @@ -0,0 +1,28 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {63245e01-3884-4650-b2a4-90c672eb89e9} + + + + + Source Files\utils\makels + + + \ No newline at end of file diff --git a/projects/vs2010/mdlviewer.vcxproj b/projects/vs2010/mdlviewer.vcxproj new file mode 100644 index 0000000..f79c9ee --- /dev/null +++ b/projects/vs2010/mdlviewer.vcxproj @@ -0,0 +1,100 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + {348EA74B-9E7E-4F35-9474-69A5DB1B5A42} + Win32Proj + bspinfo + + + + Application + true + MultiByte + + + Application + false + true + MultiByte + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common;../../common + + + Console + true + opengl32.lib;glu32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common;../../common + + + Console + true + true + true + opengl32.lib;glu32.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/projects/vs2010/mdlviewer.vcxproj.filters b/projects/vs2010/mdlviewer.vcxproj.filters new file mode 100644 index 0000000..0ec0c87 --- /dev/null +++ b/projects/vs2010/mdlviewer.vcxproj.filters @@ -0,0 +1,60 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + {9e2cd4d4-3990-41a2-ae01-1cdcaeb123b2} + + + {7906402f-88d4-4690-a65a-bc8b7c7fe8a0} + + + {a2b18871-ad87-49ac-8bfd-23c47a207fa5} + + + + + Source Files\utils\common + + + Source Files\utils\mdlviewer + + + Source Files\utils\mdlviewer + + + Source Files\utils\mdlviewer + + + + + Header Files\utils\mdlviewer + + + Header Files\utils\common + + + + + + \ No newline at end of file diff --git a/projects/vs2010/mkmovie.vcxproj b/projects/vs2010/mkmovie.vcxproj new file mode 100644 index 0000000..a2e5ce2 --- /dev/null +++ b/projects/vs2010/mkmovie.vcxproj @@ -0,0 +1,92 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + {67FAB994-BEE5-4537-8E00-60259F66F654} + Win32Proj + bspinfo + + + + Application + true + MultiByte + + + Application + false + true + MultiByte + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/projects/vs2010/mkmovie.vcxproj.filters b/projects/vs2010/mkmovie.vcxproj.filters new file mode 100644 index 0000000..99499cd --- /dev/null +++ b/projects/vs2010/mkmovie.vcxproj.filters @@ -0,0 +1,42 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + {62158a60-3771-4525-8b2c-953f323849d8} + + + + + Source Files\utils\mkmovie + + + + + Header Files\utils\common + + + Header Files\utils\common + + + \ No newline at end of file diff --git a/projects/vs2010/procinfo.vcxproj b/projects/vs2010/procinfo.vcxproj new file mode 100644 index 0000000..f6a990f --- /dev/null +++ b/projects/vs2010/procinfo.vcxproj @@ -0,0 +1,99 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {2DE8C1AF-56AE-4B99-8AA5-BEDBF33D6216} + v4.0 + ManagedCProj + procinfo + + + + StaticLibrary + true + MultiByte + + + StaticLibrary + false + MultiByte + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + + + true + + + + + attrib -r ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib +copy $(TargetPath) ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib + + + Post-Build Event + + + + + Level3 + WIN32;NDEBUG;%(PreprocessorDefinitions) + + + true + + + + + attrib -r ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib +copy $(TargetPath) ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib + Post-Build Event + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/projects/vs2010/procinfo.vcxproj.filters b/projects/vs2010/procinfo.vcxproj.filters new file mode 100644 index 0000000..2563315 --- /dev/null +++ b/projects/vs2010/procinfo.vcxproj.filters @@ -0,0 +1,39 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {3d07af82-de85-47cb-bd87-125a9043c5ad} + + + {b8aff63a-415c-4e31-ad22-ba822090e8a2} + + + {acb9edd8-ccf7-4221-8893-0cd5a3368fbc} + + + {93d4c035-5f6d-4ffd-83c0-af849ad01f21} + + + + + Source Files\utils\procinfo + + + + + Header Files\utils\procinfo + + + \ No newline at end of file diff --git a/projects/vs2010/qbsp2.vcxproj b/projects/vs2010/qbsp2.vcxproj new file mode 100644 index 0000000..a994b71 --- /dev/null +++ b/projects/vs2010/qbsp2.vcxproj @@ -0,0 +1,111 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + {415A5B85-BEA0-4F96-BBB6-5447E4CF726F} + Win32Proj + bspinfo + + + + Application + true + NotSet + + + Application + false + true + NotSet + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;DOUBLEVEC_T;_NOENUMQBOOL;%(PreprocessorDefinitions) + ../../utils/common;..\..\external + + + Console + true + opengl32.lib;glu32.lib;glaux.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;DOUBLEVEC_T;%(PreprocessorDefinitions) + ../../utils/common;..\..\external + + + Console + true + true + true + opengl32.lib;glu32.lib;glaux.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/projects/vs2010/qbsp2.vcxproj.filters b/projects/vs2010/qbsp2.vcxproj.filters new file mode 100644 index 0000000..1c1e3ba --- /dev/null +++ b/projects/vs2010/qbsp2.vcxproj.filters @@ -0,0 +1,99 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + {9e2cd4d4-3990-41a2-ae01-1cdcaeb123b2} + + + {d644c063-b652-4ccb-8bcb-f55aad917c62} + + + {b5377a13-8c89-4fca-9dc1-d94312a449cd} + + + + + Header Files\utils\qbsp2 + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\qbsp2 + + + Source Files\utils\qbsp2 + + + Source Files\utils\qbsp2 + + + Source Files\utils\qbsp2 + + + Source Files\utils\qbsp2 + + + Source Files\utils\qbsp2 + + + Source Files\utils\qbsp2 + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\qbsp2 + + + Source Files\utils\qbsp2 + + + \ No newline at end of file diff --git a/projects/vs2010/qcsg.vcxproj b/projects/vs2010/qcsg.vcxproj new file mode 100644 index 0000000..d724861 --- /dev/null +++ b/projects/vs2010/qcsg.vcxproj @@ -0,0 +1,110 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + + + + + + + + + {0F44E796-FAFD-4D52-91DE-707B5FB27841} + Win32Proj + bspinfo + + + + Application + true + MultiByte + + + Application + false + true + MultiByte + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;DOUBLEVEC_T;%(PreprocessorDefinitions) + ../../utils/common;../../external + + + Console + true + opengl32.lib;glu32.lib;glaux.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;DOUBLEVEC_T;%(PreprocessorDefinitions) + ../../utils/common;../../external + + + Console + true + true + true + opengl32.lib;glu32.lib;glaux.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/projects/vs2010/qcsg.vcxproj.filters b/projects/vs2010/qcsg.vcxproj.filters new file mode 100644 index 0000000..d50ab1b --- /dev/null +++ b/projects/vs2010/qcsg.vcxproj.filters @@ -0,0 +1,96 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + {9e2cd4d4-3990-41a2-ae01-1cdcaeb123b2} + + + {c207af92-a0f3-402b-b5c1-7ae72a1d972c} + + + {a4552d55-15d2-4b83-850f-cef12647285f} + + + + + Source Files\utils\qcsg + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\qcsg + + + Source Files\utils\qcsg + + + Source Files\utils\qcsg + + + Source Files\utils\qcsg + + + Source Files\utils\qcsg + + + Source Files\utils\common + + + Source Files\utils\common + + + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\qcsg + + + \ No newline at end of file diff --git a/projects/vs2010/qlumpy.vcxproj b/projects/vs2010/qlumpy.vcxproj new file mode 100644 index 0000000..737ae43 --- /dev/null +++ b/projects/vs2010/qlumpy.vcxproj @@ -0,0 +1,100 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + {01780C5F-55A2-41D4-B27F-6383BB549DE4} + Win32Proj + bspinfo + + + + Application + true + NotSet + + + Application + false + true + NotSet + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/projects/vs2010/qlumpy.vcxproj.filters b/projects/vs2010/qlumpy.vcxproj.filters new file mode 100644 index 0000000..4435702 --- /dev/null +++ b/projects/vs2010/qlumpy.vcxproj.filters @@ -0,0 +1,72 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + {9e2cd4d4-3990-41a2-ae01-1cdcaeb123b2} + + + {40830782-1c0d-42a8-85f0-09f7e3f4ff75} + + + {b2425109-9ba3-4a19-9a54-7451f3a87a23} + + + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\qlumpy + + + Source Files\utils\qlumpy + + + + + Header Files\utils\qlumpy + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + \ No newline at end of file diff --git a/projects/vs2010/qrad.vcxproj b/projects/vs2010/qrad.vcxproj new file mode 100644 index 0000000..a615376 --- /dev/null +++ b/projects/vs2010/qrad.vcxproj @@ -0,0 +1,106 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + + + + + + + {A015F691-DF6B-4E05-AB3B-4B0A55C13EDC} + Win32Proj + bspinfo + + + + Application + true + NotSet + + + Application + false + true + NotSet + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/projects/vs2010/qrad.vcxproj.filters b/projects/vs2010/qrad.vcxproj.filters new file mode 100644 index 0000000..81c6772 --- /dev/null +++ b/projects/vs2010/qrad.vcxproj.filters @@ -0,0 +1,90 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + {9e2cd4d4-3990-41a2-ae01-1cdcaeb123b2} + + + {bcc621aa-c3f2-45d3-8c92-d4c1dab462b4} + + + {67707ba9-3f42-423a-9494-4cbdce9f8710} + + + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\qrad + + + Source Files\utils\qrad + + + Source Files\utils\qrad + + + Source Files\utils\qrad + + + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\qrad + + + \ No newline at end of file diff --git a/projects/vs2010/readme.txt b/projects/vs2010/readme.txt new file mode 100644 index 0000000..77423f3 --- /dev/null +++ b/projects/vs2010/readme.txt @@ -0,0 +1,132 @@ +Directory Contents +================== + +projects.sln + Solution file for Visual C++ 2010 Express, containing the main projects for + compiling the valve, dmc and ricochet DLL files. + +utils.sln + Solution file containing projects for the utilities. Special user interaction + is required in order to compile a share of the projects, see "Installing GLUT + and GLAUX" bellow. + The serverctrl project is problematic, see "serverctrl project" bellow. + Further project specific notes are also provided bellow. + +[other required files] + + + +Installing GLUT and GLAUX +========================= + +Some projects in utils.sln use the GLUT (mdlviwer) and the GLAUX (qbsp2, qcsg) +libraries, which are not shipped with Visual C++ 2010 Express / Windows SDK +v7.0A. + +Thus you need to install the GLUT and GLAUX libraries manually: + + +Installing GLUT library +----------------------- + +Required by: mdlviewer + +There are several ways to do this, an example can be found here: +http://stackoverflow.com/a/10467488 + +For alternate implementations check the web (i.e. freeglut). + + +Installing GLAUX library: +------------------------- + +Required by: qbsp2, qcsg + +Obtaining the library: +http://stackoverflow.com/a/6211119 + +Copy glaux.h into 'C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\GL\' +(You might need to create the GL directory.). +Copy glaux.lib into 'C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\'. + + +TODO +---- + +In the future the projects using GLUT and GLAUX could be ported to use the SDL2 +library shipped with the SDK, this should be fairly easy, however this might +be beyond the scope of the main repository. + + + +Other +===== + +Please note, that some of the utils have additional documentation (.doc / .txt) +in the appropriate sub-folders of the utils folder. + + + +qrad project +============ + +Please not that qrad.exe requires additional files lights.rad and valve.rad +side-by-side. You can find those files in the Half-Life SDK in the Hammer +tools folder. + + + +serverctrl project +================== + +The serverctrl project is problematic for the following reasons: +- It doesn't seem to work anymore, I tried with a recent HLDS beta installation + from steamcmd (make sure to set the hardcoded path in ServerCtrlDlg.cpp line + 477, i.e. to "." (which would mean current directory) or s.th. you like). + While the hlds.exe seems to know about the -HFILE -HCHILD and -HPARENT + command line arguments used by serverctrl, it doesn't seem to handle the + events properly anymore. +- It requires MFC to be installed and needs to be configured in order to find + the MFC installation (see "Installing MFC" bellow). + +A further note: +The serverctrl.vcxproj differs from the original .dsp project a bit: +It is compiled against dynamic libraries (MFC and Windows Runtime), meaning +/MD or /MDd instead of /MT or /MTd now. The reason is that the MFC from the +Windows Driver Kit won't compile in static mode (missing resource files i.e.). +This means you'll have to redistribute the runtime and MFC DLLs along with +serverctrl in case you install it on another system. + + +Installing MFC +-------------- + +Required by: serverctrl + +If you are not using an Express edition, you can most likely skip this step. + +The MFC is also shipped as part of the Windows Driver Kit for Windows XP. + +Download Windows Driver Kit Version 7.1.0: +http://www.microsoft.com/en-us/download/details.aspx?id=11800 + +Burn it to a CD and start KitSetup.exe. +It's enough to select "Build Environment" in the options you want to install. + +Now we need to point Visual C++ 2010 Express to the folders for the MFC/ATL +includes and libraries: + +To do this open utils.sln and right click the serverctrl project and select +Properties. Select Configuration: All Configurations, then select +Configuration -> VC++ Directories in the tree. Adjust the Include and +Library Directories settings to match your WDK installation (click on the lines +and then click on the drop-down selector that appears and select edit). + + + +smdlexp project +=============== + +Please note that this project requires the 3D Studio Max 4.2 SDK. +You might need to adjust Include and Additional Library Directories according +to your intallation. diff --git a/projects/vs2010/serverctrl.vcxproj b/projects/vs2010/serverctrl.vcxproj new file mode 100644 index 0000000..8cc9eb1 --- /dev/null +++ b/projects/vs2010/serverctrl.vcxproj @@ -0,0 +1,112 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {AF96A753-E234-4692-90AB-CCD802E34E9C} + Win32Proj + serverctrl + + + + Application + true + MultiByte + Dynamic + + + Application + false + true + MultiByte + Dynamic + + + + + + + + + + + + + true + E:\WinDDK\7600.16385.1\inc\atl71;E:\WinDDK\7600.16385.1\inc\mfc42;$(IncludePath) + E:\WinDDK\7600.16385.1\lib\ATL\i386;E:\WinDDK\7600.16385.1\lib\Mfc\i386;$(LibraryPath) + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + E:\WinDDK\7600.16385.1\inc\atl71;E:\WinDDK\7600.16385.1\inc\mfc42;$(IncludePath) + E:\WinDDK\7600.16385.1\lib\ATL\i386;E:\WinDDK\7600.16385.1\lib\Mfc\i386;$(LibraryPath) + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + Windows + true + winmm.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Windows + true + true + true + winmm.lib;%(AdditionalDependencies) + + + + + + + Create + Create + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/projects/vs2010/serverctrl.vcxproj.filters b/projects/vs2010/serverctrl.vcxproj.filters new file mode 100644 index 0000000..1d945f9 --- /dev/null +++ b/projects/vs2010/serverctrl.vcxproj.filters @@ -0,0 +1,76 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {b6851a08-110d-4b63-97bb-002b6c26576e} + + + {b210c226-0069-49ec-87ea-a3c9c16d737b} + + + {7ffbb312-a0a2-4787-af0a-d3e499f4c628} + + + {5de03485-5c29-4f54-95df-161e73d864e2} + + + {1b20963c-0f73-4f11-a8ff-8cec4041bf4c} + + + {f55832d2-48da-4c3e-90bd-66f24f495211} + + + {d2b2c612-d341-4167-80d5-a49ae6887f4a} + + + + + Source Files\utils\servertrl + + + Source Files\utils\servertrl + + + Source Files\utils\servertrl + + + + + Header Files\utils\serverctrl + + + Header Files\utils\serverctrl + + + Header Files\utils\serverctrl + + + Header Files\utils\serverctrl + + + + + Source Files\utils\servertrl + + + + + Resource Files\utils\serverctrl\res + + + Resource Files\utils\serverctrl\res + + + \ No newline at end of file diff --git a/projects/vs2010/smdlexp.vcxproj b/projects/vs2010/smdlexp.vcxproj new file mode 100644 index 0000000..578034a --- /dev/null +++ b/projects/vs2010/smdlexp.vcxproj @@ -0,0 +1,115 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {4BFEAD42-DBED-40F0-B30E-E5AF9EBA59A8} + v4.0 + ManagedCProj + procinfo + + + + DynamicLibrary + true + MultiByte + + + DynamicLibrary + false + MultiByte + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + c:\3dsmax42\maxsdk\include;c:\3dsmax42\cstudio\sdk;%(AdditionalIncludeDirectories) + + + true + COMCTL32.LIB;maxutil.lib;geom.lib;mesh.lib;core.lib;%(AdditionalDependencies) + c:\3dsmax42\maxsdk\lib;%(AdditionalLibraryDirectories) + c:\3dsmax42\plugins\smdlexp.dle + + + attrib -r ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib +copy $(TargetPath) ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib + + + Post-Build Event + + + COMCTL32.LIB;maxutil.lib;geom.lib;mesh.lib;core.lib;%(AdditionalDependencies) + + + + + Level3 + WIN32;NDEBUG;%(PreprocessorDefinitions) + c:\3dsmax42\maxsdk\include;c:\3dsmax42\cstudio\sdk;%(AdditionalIncludeDirectories) + + + true + COMCTL32.LIB;maxutil.lib;geom.lib;mesh.lib;core.lib;%(AdditionalDependencies) + c:\3dsmax42\maxsdk\lib;%(AdditionalLibraryDirectories) + c:\3dsmax42\plugins\smdlexp.dle + + + attrib -r ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib +copy $(TargetPath) ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib + Post-Build Event + + + COMCTL32.LIB;maxutil.lib;geom.lib;mesh.lib;core.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/projects/vs2010/smdlexp.vcxproj.filters b/projects/vs2010/smdlexp.vcxproj.filters new file mode 100644 index 0000000..988ba6d --- /dev/null +++ b/projects/vs2010/smdlexp.vcxproj.filters @@ -0,0 +1,55 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {3d07af82-de85-47cb-bd87-125a9043c5ad} + + + {acb9edd8-ccf7-4221-8893-0cd5a3368fbc} + + + {c35dd471-5706-455f-bd22-6964d0906c6e} + + + {17940ef9-04e1-45c8-b52e-7030fbd6de03} + + + {3980e5e7-942c-40ad-9660-0a40a185ede0} + + + {d82ea4d8-83a8-4071-b2c6-379a38d00c5b} + + + + + Resource Files\utils\smdlexp + + + + + Source Files\utils\smdlexp + + + + + Source Files\utils\smdlexp + + + + + Header Files\utils\smdlexp + + + \ No newline at end of file diff --git a/projects/vs2010/sprgen.vcxproj b/projects/vs2010/sprgen.vcxproj new file mode 100644 index 0000000..4f11cb4 --- /dev/null +++ b/projects/vs2010/sprgen.vcxproj @@ -0,0 +1,97 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + {2ADCE88F-5117-4D09-BE30-C8CBE902203E} + Win32Proj + bspinfo + + + + Application + true + NotSet + + + Application + false + true + NotSet + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/projects/vs2010/sprgen.vcxproj.filters b/projects/vs2010/sprgen.vcxproj.filters new file mode 100644 index 0000000..932914a --- /dev/null +++ b/projects/vs2010/sprgen.vcxproj.filters @@ -0,0 +1,63 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + {9e2cd4d4-3990-41a2-ae01-1cdcaeb123b2} + + + {b4223f35-828f-4e8c-a089-ba9f4ca7e0ac} + + + {a02f46e8-81c1-476c-a7f2-b222251f96e7} + + + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\sprgen + + + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\sprgen + + + \ No newline at end of file diff --git a/projects/vs2010/studiomdl.vcxproj b/projects/vs2010/studiomdl.vcxproj new file mode 100644 index 0000000..a683e3c --- /dev/null +++ b/projects/vs2010/studiomdl.vcxproj @@ -0,0 +1,104 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + + + + + {5A257608-0B80-42ED-A037-C2A02E878301} + Win32Proj + bspinfo + + + + Application + true + NotSet + + + Application + false + true + NotSet + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common;../../common;../../public + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common;../../common;../../public + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/projects/vs2010/studiomdl.vcxproj.filters b/projects/vs2010/studiomdl.vcxproj.filters new file mode 100644 index 0000000..f539a69 --- /dev/null +++ b/projects/vs2010/studiomdl.vcxproj.filters @@ -0,0 +1,84 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + {9e2cd4d4-3990-41a2-ae01-1cdcaeb123b2} + + + {11d3635c-ec17-499c-aed9-8ccc565db4ce} + + + {d8c1382c-f41c-4569-a63d-a9bb68fb7a8a} + + + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\studiomdl + + + Source Files\utils\studiomdl + + + Source Files\utils\studiomdl + + + Source Files\utils\studiomdl + + + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\studiomdl + + + \ No newline at end of file diff --git a/projects/vs2010/utils.sln b/projects/vs2010/utils.sln new file mode 100644 index 0000000..e75b536 --- /dev/null +++ b/projects/vs2010/utils.sln @@ -0,0 +1,116 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bspinfo", "bspinfo.vcxproj", "{B1227C36-C02C-4914-9675-C6D243D8B36E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "light", "light.vcxproj", "{1D9A402B-C7AB-4DAA-AD3F-42195F283E64}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makefont", "makefont.vcxproj", "{C47ACACA-7DA4-4741-A287-9215309949E7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makels", "makels.vcxproj", "{8D9315B8-D428-411B-A60F-6AFD3CE0A687}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdlviewer", "mdlviewer.vcxproj", "{348EA74B-9E7E-4F35-9474-69A5DB1B5A42}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mkmovie", "mkmovie.vcxproj", "{67FAB994-BEE5-4537-8E00-60259F66F654}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "procinfo", "procinfo.vcxproj", "{2DE8C1AF-56AE-4B99-8AA5-BEDBF33D6216}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qbsp2", "qbsp2.vcxproj", "{415A5B85-BEA0-4F96-BBB6-5447E4CF726F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qcsg", "qcsg.vcxproj", "{0F44E796-FAFD-4D52-91DE-707B5FB27841}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qlumpy", "qlumpy.vcxproj", "{01780C5F-55A2-41D4-B27F-6383BB549DE4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qrad", "qrad.vcxproj", "{A015F691-DF6B-4E05-AB3B-4B0A55C13EDC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smdlexp", "smdlexp.vcxproj", "{4BFEAD42-DBED-40F0-B30E-E5AF9EBA59A8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprgen", "sprgen.vcxproj", "{2ADCE88F-5117-4D09-BE30-C8CBE902203E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "studiomdl", "studiomdl.vcxproj", "{5A257608-0B80-42ED-A037-C2A02E878301}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vis", "vis.vcxproj", "{6CAC4D26-13B7-4701-A097-94C01340B345}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xwad", "xwad.vcxproj", "{8A13BDB4-772F-4D03-B343-B56A6D412149}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "serverctrl", "serverctrl.vcxproj", "{AF96A753-E234-4692-90AB-CCD802E34E9C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B1227C36-C02C-4914-9675-C6D243D8B36E}.Debug|Win32.ActiveCfg = Debug|Win32 + {B1227C36-C02C-4914-9675-C6D243D8B36E}.Debug|Win32.Build.0 = Debug|Win32 + {B1227C36-C02C-4914-9675-C6D243D8B36E}.Release|Win32.ActiveCfg = Release|Win32 + {B1227C36-C02C-4914-9675-C6D243D8B36E}.Release|Win32.Build.0 = Release|Win32 + {1D9A402B-C7AB-4DAA-AD3F-42195F283E64}.Debug|Win32.ActiveCfg = Debug|Win32 + {1D9A402B-C7AB-4DAA-AD3F-42195F283E64}.Debug|Win32.Build.0 = Debug|Win32 + {1D9A402B-C7AB-4DAA-AD3F-42195F283E64}.Release|Win32.ActiveCfg = Release|Win32 + {1D9A402B-C7AB-4DAA-AD3F-42195F283E64}.Release|Win32.Build.0 = Release|Win32 + {C47ACACA-7DA4-4741-A287-9215309949E7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C47ACACA-7DA4-4741-A287-9215309949E7}.Debug|Win32.Build.0 = Debug|Win32 + {C47ACACA-7DA4-4741-A287-9215309949E7}.Release|Win32.ActiveCfg = Release|Win32 + {C47ACACA-7DA4-4741-A287-9215309949E7}.Release|Win32.Build.0 = Release|Win32 + {8D9315B8-D428-411B-A60F-6AFD3CE0A687}.Debug|Win32.ActiveCfg = Debug|Win32 + {8D9315B8-D428-411B-A60F-6AFD3CE0A687}.Debug|Win32.Build.0 = Debug|Win32 + {8D9315B8-D428-411B-A60F-6AFD3CE0A687}.Release|Win32.ActiveCfg = Release|Win32 + {8D9315B8-D428-411B-A60F-6AFD3CE0A687}.Release|Win32.Build.0 = Release|Win32 + {348EA74B-9E7E-4F35-9474-69A5DB1B5A42}.Debug|Win32.ActiveCfg = Debug|Win32 + {348EA74B-9E7E-4F35-9474-69A5DB1B5A42}.Debug|Win32.Build.0 = Debug|Win32 + {348EA74B-9E7E-4F35-9474-69A5DB1B5A42}.Release|Win32.ActiveCfg = Release|Win32 + {348EA74B-9E7E-4F35-9474-69A5DB1B5A42}.Release|Win32.Build.0 = Release|Win32 + {67FAB994-BEE5-4537-8E00-60259F66F654}.Debug|Win32.ActiveCfg = Debug|Win32 + {67FAB994-BEE5-4537-8E00-60259F66F654}.Debug|Win32.Build.0 = Debug|Win32 + {67FAB994-BEE5-4537-8E00-60259F66F654}.Release|Win32.ActiveCfg = Release|Win32 + {67FAB994-BEE5-4537-8E00-60259F66F654}.Release|Win32.Build.0 = Release|Win32 + {2DE8C1AF-56AE-4B99-8AA5-BEDBF33D6216}.Debug|Win32.ActiveCfg = Debug|Win32 + {2DE8C1AF-56AE-4B99-8AA5-BEDBF33D6216}.Debug|Win32.Build.0 = Debug|Win32 + {2DE8C1AF-56AE-4B99-8AA5-BEDBF33D6216}.Release|Win32.ActiveCfg = Release|Win32 + {2DE8C1AF-56AE-4B99-8AA5-BEDBF33D6216}.Release|Win32.Build.0 = Release|Win32 + {415A5B85-BEA0-4F96-BBB6-5447E4CF726F}.Debug|Win32.ActiveCfg = Debug|Win32 + {415A5B85-BEA0-4F96-BBB6-5447E4CF726F}.Debug|Win32.Build.0 = Debug|Win32 + {415A5B85-BEA0-4F96-BBB6-5447E4CF726F}.Release|Win32.ActiveCfg = Release|Win32 + {415A5B85-BEA0-4F96-BBB6-5447E4CF726F}.Release|Win32.Build.0 = Release|Win32 + {0F44E796-FAFD-4D52-91DE-707B5FB27841}.Debug|Win32.ActiveCfg = Debug|Win32 + {0F44E796-FAFD-4D52-91DE-707B5FB27841}.Debug|Win32.Build.0 = Debug|Win32 + {0F44E796-FAFD-4D52-91DE-707B5FB27841}.Release|Win32.ActiveCfg = Release|Win32 + {0F44E796-FAFD-4D52-91DE-707B5FB27841}.Release|Win32.Build.0 = Release|Win32 + {01780C5F-55A2-41D4-B27F-6383BB549DE4}.Debug|Win32.ActiveCfg = Debug|Win32 + {01780C5F-55A2-41D4-B27F-6383BB549DE4}.Debug|Win32.Build.0 = Debug|Win32 + {01780C5F-55A2-41D4-B27F-6383BB549DE4}.Release|Win32.ActiveCfg = Release|Win32 + {01780C5F-55A2-41D4-B27F-6383BB549DE4}.Release|Win32.Build.0 = Release|Win32 + {A015F691-DF6B-4E05-AB3B-4B0A55C13EDC}.Debug|Win32.ActiveCfg = Debug|Win32 + {A015F691-DF6B-4E05-AB3B-4B0A55C13EDC}.Debug|Win32.Build.0 = Debug|Win32 + {A015F691-DF6B-4E05-AB3B-4B0A55C13EDC}.Release|Win32.ActiveCfg = Release|Win32 + {A015F691-DF6B-4E05-AB3B-4B0A55C13EDC}.Release|Win32.Build.0 = Release|Win32 + {4BFEAD42-DBED-40F0-B30E-E5AF9EBA59A8}.Debug|Win32.ActiveCfg = Debug|Win32 + {4BFEAD42-DBED-40F0-B30E-E5AF9EBA59A8}.Debug|Win32.Build.0 = Debug|Win32 + {4BFEAD42-DBED-40F0-B30E-E5AF9EBA59A8}.Release|Win32.ActiveCfg = Release|Win32 + {4BFEAD42-DBED-40F0-B30E-E5AF9EBA59A8}.Release|Win32.Build.0 = Release|Win32 + {2ADCE88F-5117-4D09-BE30-C8CBE902203E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2ADCE88F-5117-4D09-BE30-C8CBE902203E}.Debug|Win32.Build.0 = Debug|Win32 + {2ADCE88F-5117-4D09-BE30-C8CBE902203E}.Release|Win32.ActiveCfg = Release|Win32 + {2ADCE88F-5117-4D09-BE30-C8CBE902203E}.Release|Win32.Build.0 = Release|Win32 + {5A257608-0B80-42ED-A037-C2A02E878301}.Debug|Win32.ActiveCfg = Debug|Win32 + {5A257608-0B80-42ED-A037-C2A02E878301}.Debug|Win32.Build.0 = Debug|Win32 + {5A257608-0B80-42ED-A037-C2A02E878301}.Release|Win32.ActiveCfg = Release|Win32 + {5A257608-0B80-42ED-A037-C2A02E878301}.Release|Win32.Build.0 = Release|Win32 + {6CAC4D26-13B7-4701-A097-94C01340B345}.Debug|Win32.ActiveCfg = Debug|Win32 + {6CAC4D26-13B7-4701-A097-94C01340B345}.Debug|Win32.Build.0 = Debug|Win32 + {6CAC4D26-13B7-4701-A097-94C01340B345}.Release|Win32.ActiveCfg = Release|Win32 + {6CAC4D26-13B7-4701-A097-94C01340B345}.Release|Win32.Build.0 = Release|Win32 + {8A13BDB4-772F-4D03-B343-B56A6D412149}.Debug|Win32.ActiveCfg = Debug|Win32 + {8A13BDB4-772F-4D03-B343-B56A6D412149}.Debug|Win32.Build.0 = Debug|Win32 + {8A13BDB4-772F-4D03-B343-B56A6D412149}.Release|Win32.ActiveCfg = Release|Win32 + {8A13BDB4-772F-4D03-B343-B56A6D412149}.Release|Win32.Build.0 = Release|Win32 + {AF96A753-E234-4692-90AB-CCD802E34E9C}.Debug|Win32.ActiveCfg = Debug|Win32 + {AF96A753-E234-4692-90AB-CCD802E34E9C}.Debug|Win32.Build.0 = Debug|Win32 + {AF96A753-E234-4692-90AB-CCD802E34E9C}.Release|Win32.ActiveCfg = Release|Win32 + {AF96A753-E234-4692-90AB-CCD802E34E9C}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/projects/vs2010/vis.vcxproj b/projects/vs2010/vis.vcxproj new file mode 100644 index 0000000..027a045 --- /dev/null +++ b/projects/vs2010/vis.vcxproj @@ -0,0 +1,105 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + + + + + + {6CAC4D26-13B7-4701-A097-94C01340B345} + Win32Proj + bspinfo + + + + Application + true + NotSet + + + Application + false + true + NotSet + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/projects/vs2010/vis.vcxproj.filters b/projects/vs2010/vis.vcxproj.filters new file mode 100644 index 0000000..d4bbc33 --- /dev/null +++ b/projects/vs2010/vis.vcxproj.filters @@ -0,0 +1,90 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + {9e2cd4d4-3990-41a2-ae01-1cdcaeb123b2} + + + {6a461af5-7f20-49f1-b81b-684bd6dacbcc} + + + {c1ec9e3b-b79b-41c2-9151-22820cd13949} + + + {da7d197c-82da-4691-afd9-0249b0436923} + + + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\vis + + + Source Files\utils\vis + + + Source Files\utils\vis + + + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\vis + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\common + + + Header Files\utils\qbsp2 + + + \ No newline at end of file diff --git a/projects/vs2010/xwad.vcxproj b/projects/vs2010/xwad.vcxproj new file mode 100644 index 0000000..1dac95e --- /dev/null +++ b/projects/vs2010/xwad.vcxproj @@ -0,0 +1,91 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + {8A13BDB4-772F-4D03-B343-B56A6D412149} + Win32Proj + bspinfo + + + + Application + true + MultiByte + + + Application + false + true + MultiByte + + + + + + + + + + + + + true + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + false + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\int\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;DOUBLEVEC_T;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;DOUBLEVEC_T;%(PreprocessorDefinitions) + ../../utils/common + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/projects/vs2010/xwad.vcxproj.filters b/projects/vs2010/xwad.vcxproj.filters new file mode 100644 index 0000000..d3d5e79 --- /dev/null +++ b/projects/vs2010/xwad.vcxproj.filters @@ -0,0 +1,49 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d5586ccb-fc7d-4e19-8bde-8656f3036ed7} + + + {23430839-825c-42f8-87f8-5ae8dbcbb612} + + + {b9529791-81ac-4e1b-86b7-e3ae05d40193} + + + {9e2cd4d4-3990-41a2-ae01-1cdcaeb123b2} + + + {ec10acce-757c-4a52-8d45-a0ff3057eef4} + + + {a00d342e-ddd3-4ad1-8c9e-28f591981c0a} + + + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\common + + + Source Files\utils\xwad + + + \ No newline at end of file diff --git a/utils/mdlviewer/mdlviewer.cpp b/utils/mdlviewer/mdlviewer.cpp index 4194782..666085a 100644 --- a/utils/mdlviewer/mdlviewer.cpp +++ b/utils/mdlviewer/mdlviewer.cpp @@ -15,6 +15,7 @@ #include #include "mathlib.h" +#include "../../public/steam/steamtypes.h" // defines int32, required by studio.h #include "..\..\engine\studio.h" #include "mdlviewer.h" diff --git a/utils/mdlviewer/studio_render.cpp b/utils/mdlviewer/studio_render.cpp index 2181a48..bcaea00 100644 --- a/utils/mdlviewer/studio_render.cpp +++ b/utils/mdlviewer/studio_render.cpp @@ -22,6 +22,7 @@ //////////////////////////////////////////////////////////////////////// #include "mathlib.h" +#include "../../public/steam/steamtypes.h" // defines int32, required by studio.h #include "..\..\engine\studio.h" #include "mdlviewer.h" @@ -265,7 +266,7 @@ mstudioanim_t * StudioModel::GetAnim( mstudioseqdesc_t *pseqdesc ) if (pseqdesc->seqgroup == 0) { - return (mstudioanim_t *)((byte *)m_pstudiohdr + pseqgroup->data + pseqdesc->animindex); + return (mstudioanim_t *)((byte *)m_pstudiohdr + pseqgroup->unused2 /* was pseqgroup->data, will be almost always be 0 */ + pseqdesc->animindex); } return (mstudioanim_t *)((byte *)m_panimhdr[pseqdesc->seqgroup] + pseqdesc->animindex); diff --git a/utils/mdlviewer/studio_utils.cpp b/utils/mdlviewer/studio_utils.cpp index 708ac8f..7a6e9c6 100644 --- a/utils/mdlviewer/studio_utils.cpp +++ b/utils/mdlviewer/studio_utils.cpp @@ -20,6 +20,7 @@ #include #include "mathlib.h" +#include "../../public/steam/steamtypes.h" // defines int32, required by studio.h #include "..\..\engine\studio.h" #include "mdlviewer.h" @@ -32,19 +33,20 @@ static int g_texnum = 1; void StudioModel::UploadTexture(mstudiotexture_t *ptexture, byte *data, byte *pal) { // unsigned *in, int inwidth, int inheight, unsigned *out, int outwidth, int outheight; + int outwidth, outheight; int i, j; int row1[256], row2[256], col1[256], col2[256]; byte *pix1, *pix2, *pix3, *pix4; byte *tex, *out; // convert texture to power of 2 - for (int outwidth = 1; outwidth < ptexture->width; outwidth <<= 1) + for (outwidth = 1; outwidth < ptexture->width; outwidth <<= 1) ; if (outwidth > 256) outwidth = 256; - for (int outheight = 1; outheight < ptexture->height; outheight <<= 1) + for (outheight = 1; outheight < ptexture->height; outheight <<= 1) ; if (outheight > 256) @@ -266,10 +268,11 @@ void StudioModel::GetSequenceInfo( float *pflFrameRate, float *pflGroundSpeed ) float StudioModel::SetController( int iController, float flValue ) { + int i; mstudiobonecontroller_t *pbonecontroller = (mstudiobonecontroller_t *)((byte *)m_pstudiohdr + m_pstudiohdr->bonecontrollerindex); // find first controller that matches the index - for (int i = 0; i < m_pstudiohdr->numbonecontrollers; i++, pbonecontroller++) + for (i = 0; i < m_pstudiohdr->numbonecontrollers; i++, pbonecontroller++) { if (pbonecontroller->index == iController) break; diff --git a/utils/qbsp2/bsp5.h b/utils/qbsp2/bsp5.h index d30821e..427966e 100644 --- a/utils/qbsp2/bsp5.h +++ b/utils/qbsp2/bsp5.h @@ -10,8 +10,6 @@ // bsp5.h -#include "mathlib.h" -#include "const.h" #include "cmdlib.h" #include "mathlib.h" #include "bspfile.h" diff --git a/utils/qrad/qrad.h b/utils/qrad/qrad.h index 297a95d..20f2ade 100644 --- a/utils/qrad/qrad.h +++ b/utils/qrad/qrad.h @@ -23,7 +23,9 @@ #include #pragma warning(disable: 4142 4028) +#define filelength IO_filelength #include +#undef filelength #pragma warning(default: 4142 4028) #include