[Tinman]

Gah... I am having a frustrating time trying to apply this patch file (last time I had to make the changes manually).
[...]
I've Google'd for newline and CRLF issues when using a Windows produced patch on OS X / Unix with no success with any of the suggested fixes, nor with --ignore-whitespaces or -Fn. Any help or suggestions?

I ran into the same problems on MacOS X for both patches.
I used my Win7 box with TortoiseSVN to merge the patch and copied both files gr...cpp/.h to my Mac.
(And also compiled it on Win7 VS2008Pro)

edit: files attached, HTH  

[attachment deleted by admin]

[Echelon9]

Thanks Tinman!

Update: Attached is a .patch file that is of Hery's most recent changes (December 19, 2009, 07:30:58 pm), in a format that will work on Mac OS X.

[attachment deleted by admin]

[Echelon9]

Committed in r5727, at Hery's request.

[Tinman]

MacOS X compiling is broken due to TrackIR ->gTirDll_TrackIR stuff in freespace.c and lua.c and maybe somewhere else?
I think it needs to be in win32 only.

Maybe a SCP Mac developer can look into it.  

[portej05]

Need build log please.

[Tinman]

Code: [Select]


Undefined symbols:
  "_gTirDll_TrackIR", referenced from:
      _gTirDll_TrackIR$non_lazy_ptr in freespace.o
ld: symbol(s) not found
collect2: ld returned 1 exit status

Undefined symbols:
  "_gTirDll_TrackIR", referenced from:
      _gTirDll_TrackIR$non_lazy_ptr in libcode.a(lua.o)
ld: symbol(s) not found
collect2: ld returned 1 exit status


HTH

[Zacam]

I have absolutely no idea if this will help in the slightest, but here is an SVN .patch based off of nothing at all other than logical assumption:

(Apple-Click or Right-Click and Save-As)
http://zacam.ueuo.com/scp/Patches/TrackIR_xcode.patch

[Echelon9]

Revision 5789 build fine with Xcode 3.2.1

[chief1983]

Yup fixed it last night with commit 5788.  Thought there were still some issues, so I updated SVN, reverted the xcodeproj to 5762, before any TrackIR stuff went in, then added and deleted the necessary files in Xcode.  It looked pretty clean compared to the 5762 version, so I committed over whatever was currently in SVN.  If there were any other xcodeproj changes made, which it did not seem they were, they may have been missed.  Pretty sure it was all related to TrackIR fixery though.