Come Chat with us live! Learn how HERE!
I have a *.patch file (downloaded somewhere here, forgot).I'm on windows, just wondering how i can "apply" this patch to make it work?[/u]
patch -p0 -F0 <path/to/patch
Quote from: "cp blast"I have a *.patch file (downloaded somewhere here, forgot).I'm on windows, just wondering how i can "apply" this patch to make it work?[/u]Install Cygwin. UNIX-like command-line environment makes development much easier when you get the hang of it.Then just change dir to the source root and runCode: [Select]patch -p0 -F0 <path/to/patch
...
Quote from: "Risujin"Follow these steps to compile the Tremulous client on Windows:[list=1] Go to http://www.mingw.org/download.shtml Download MSys EXE under Current Download MinGW EXE under Previous Download w32api-3.6.tar.gz under Current Go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 Download svn-1.4.2-setup.exe (or the latest *-setup.exe for svn) If your papers are in order you can get the DirectX SDK from MicrosoftAlternatively, you can grab the two header files you need out of here from my website:http://risujin.org/pub/tremulous/tremulous-dxsdk.zip Install subversion, use default paths etc Install MSys, but NOT to a path with a space in it! That means NO "Program Files", put it in C:\MSys Install MinGW to your C:\MSys\MinGW (folder should exist already) Install the MinGW Windows API by extracting it into the C:\MSys\mingw directory. You can do this either with WinRAR or through the MSys terminal using Unix tar commands:[list=1] Move the win32-api tar file to the C:\MSys\mingw directory. Open the MSys link on your desktop or start C:\MSys\msys.bat Change to the mingw directory ('cd ../../mingw' should do it) Untar the tar file ('tar xzf w32api-3.6.tar.gz')[/list:o]That should work though I personally used WinRAR. Install the DirectX SDK if you downloaded it Copy dinput.h and dsound.h from either the DirectX SDK include folder or from my archive to MSys\MinGW\include Download the latest Tremulous SVN code by opening a console, cd'ing to your MinGW home folder ('cd C:\MinGW\home\User'), and typing the SVN command:Code: [Select]svn co -r 895 svn://svn.icculus.org/tremulous/trunk Tremulous (if you feel confident, you can remove the '-r 895' part to download the latest SVN, but success is not guaranteed :))If your code is not in a subdirectory of your MinGW home folder you will need to mount it (skip this otherwise):[list=1] Open C:\MSys\etc\fstab.sample Comment out (add #s) to the two lines at the bottom Add your Tremulous SVN folder and mount point (e.g. 'C:\Tremulous /home/User/Tremulous') Open your mount point in the MSys directory tree and create the folder (MSys\home\User\Tremulous) Rename fstab.sample to fstab[/list:o] If you let it, MSys has created a shortcut on your desktop, start it; if not start C:\MSys\msys.bat cd to your Tremulous mount point ('cd Tremulous') Create a Makefile.local Edit your Makefile.local to read 'BUILD_GAME_QVM=0' if you don't want to compile the QVMs otherwise add 'INCLUDE=' and 'LIBRARY=' (original fix). Add 'USE_CURL=1' if you want WWW redirection support. Run make ('make' NOT 'mingw32-make' which doesn't work for some reason...) If all went well, your brand new tremulous.x86.exe is waiting for you in build/release-mingw-x86/[/list:o]I couldn't compile game QVMs this way as it would hang when running one of the Quake QVM tools. This wasn't a problem for me as I can build the QVMs from Linux.There are several mysteries about this process. I don't understand why it compiled without the OpenAL or SDL libraries (though they may have defaulted to off). Further, why are two DirectX headers necessary when the game never links to DirectX libraries?for step 5) go to http://tortoisesvn.tigris.org/for step 6) download tortoise svnfor step 7) nothingfor step 8 ) install tortoise svn - you will need to restartfor step 12) nothing - no directx sdk neededfor step 13) Download http://www.libsdl.org/extras/win32/common/directx-devel.tar.gz and untar it into your MinGW directory (usually C:\MinGW).for step 14) create a folder for svn download "c:\tremulous_svn" for exampleright click the folder and select svn checkout follow the sub steps 1-5type Code: [Select]svn://svn.icculus.org/tremulous/trunk as the svn addressfor step 16) "cd /c/tremulous_svn" if you used "c:\tremulous_svn"for step 17) optionalfor step 18 ) optional - curl is on by defaultyou can use -e switch to set compile options for ex:"make -e BUILD_CLIENT=0 BUILD_CLIENT_SMP=0 BUILD_SERVER=0 BUILD_GAME_SO=0 BUILD_GAME_QVM=1"no client/smp client/server/game dll but game qvm
Follow these steps to compile the Tremulous client on Windows:[list=1] Go to http://www.mingw.org/download.shtml Download MSys EXE under Current Download MinGW EXE under Previous Download w32api-3.6.tar.gz under Current Go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 Download svn-1.4.2-setup.exe (or the latest *-setup.exe for svn) If your papers are in order you can get the DirectX SDK from MicrosoftAlternatively, you can grab the two header files you need out of here from my website:http://risujin.org/pub/tremulous/tremulous-dxsdk.zip Install subversion, use default paths etc Install MSys, but NOT to a path with a space in it! That means NO "Program Files", put it in C:\MSys Install MinGW to your C:\MSys\MinGW (folder should exist already) Install the MinGW Windows API by extracting it into the C:\MSys\mingw directory. You can do this either with WinRAR or through the MSys terminal using Unix tar commands:[list=1] Move the win32-api tar file to the C:\MSys\mingw directory. Open the MSys link on your desktop or start C:\MSys\msys.bat Change to the mingw directory ('cd ../../mingw' should do it) Untar the tar file ('tar xzf w32api-3.6.tar.gz')[/list:o]That should work though I personally used WinRAR. Install the DirectX SDK if you downloaded it Copy dinput.h and dsound.h from either the DirectX SDK include folder or from my archive to MSys\MinGW\include Download the latest Tremulous SVN code by opening a console, cd'ing to your MinGW home folder ('cd C:\MinGW\home\User'), and typing the SVN command:Code: [Select]svn co -r 895 svn://svn.icculus.org/tremulous/trunk Tremulous (if you feel confident, you can remove the '-r 895' part to download the latest SVN, but success is not guaranteed :))If your code is not in a subdirectory of your MinGW home folder you will need to mount it (skip this otherwise):[list=1] Open C:\MSys\etc\fstab.sample Comment out (add #s) to the two lines at the bottom Add your Tremulous SVN folder and mount point (e.g. 'C:\Tremulous /home/User/Tremulous') Open your mount point in the MSys directory tree and create the folder (MSys\home\User\Tremulous) Rename fstab.sample to fstab[/list:o] If you let it, MSys has created a shortcut on your desktop, start it; if not start C:\MSys\msys.bat cd to your Tremulous mount point ('cd Tremulous') Create a Makefile.local Edit your Makefile.local to read 'BUILD_GAME_QVM=0' if you don't want to compile the QVMs otherwise add 'INCLUDE=' and 'LIBRARY=' (original fix). Add 'USE_CURL=1' if you want WWW redirection support. Run make ('make' NOT 'mingw32-make' which doesn't work for some reason...) If all went well, your brand new tremulous.x86.exe is waiting for you in build/release-mingw-x86/[/list:o]I couldn't compile game QVMs this way as it would hang when running one of the Quake QVM tools. This wasn't a problem for me as I can build the QVMs from Linux.There are several mysteries about this process. I don't understand why it compiled without the OpenAL or SDL libraries (though they may have defaulted to off). Further, why are two DirectX headers necessary when the game never links to DirectX libraries?
svn co -r 895 svn://svn.icculus.org/tremulous/trunk Tremulous
svn://svn.icculus.org/tremulous/trunk
I use the program tortoise svn to set this patch http://wraths.dyndns.org/downloads/code/patches/svn901/999.even_more_all_in_one-044.patchI do right click mouse in folder tremulous_svn TortoiseSVN>Apply patch..>use patch>>ERROR TortoiseMergeThe line "Index:" was not found!Either this is not a diff file or the diff is emptyhow to set is this patch correct?I looked over all of forum and did not find an answer =(plz help
diff -Nru trem901-original/src/cgame/cg_public.h trem901-original-wrath-tmp/src/cgame/cg_public.h--- trem901-original/src/cgame/cg_public.h 2007-05-05 14:56:02.000000000 +0200+++ trem901-original-wrath-tmp/src/cgame/cg_public.h 2007-08-18 10:25:12.000000000 +0200
Index: src/cgame/cg_public.h --- src/cgame/cg_public.h 2007-05-05 14:56:02.000000000 +0200+++ src/cgame/cg_public.h 2007-08-18 10:25:12.000000000 +0200