From: <baz...@us...> - 2008-12-20 09:33:22
|
Revision: 8673 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8673&view=rev Author: bazaarmagetron Date: 2008-12-20 09:33:14 +0000 (Sat, 20 Dec 2008) Log Message: ----------- Daniel Lee Harple: Fixed dedicated building. We don't need copy/paste stuff there Modified Paths: -------------- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj armagetronad/trunk/armagetronad/src/ui/uMenu.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2008-12-20 03:55:02.255000114 -0500 committer: Daniel Lee Harple <lee...@gm...> properties: branch-nick: armagetronad + timestamp: 2008-12-20 04:28:21.411999941 -0500 committer: Daniel Lee Harple <lee...@gm...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb Modified: armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj =================================================================== --- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-20 09:06:33 UTC (rev 8672) +++ armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-20 09:33:14 UTC (rev 8673) @@ -321,7 +321,6 @@ 9BCBE30D0D922EAE0022855B /* AAPaste.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BCBE30B0D922EAE0022855B /* AAPaste.h */; }; 9BCBE30E0D922EAE0022855B /* AAPaste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BCBE30C0D922EAE0022855B /* AAPaste.cpp */; }; 9BCBE30F0D922EAE0022855B /* AAPaste.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BCBE30B0D922EAE0022855B /* AAPaste.h */; }; - 9BCBE3100D922EAE0022855B /* AAPaste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BCBE30C0D922EAE0022855B /* AAPaste.cpp */; }; 9BD7D9720A2C7CB400D7033C /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BD7D96B0A2C7CB400D7033C /* libfreetype.a */; }; 9BD7D9730A2C7CB400D7033C /* libftgl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BD7D96C0A2C7CB400D7033C /* libftgl.a */; }; 9BD7D9740A2C7CB400D7033C /* libpng.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BD7D96D0A2C7CB400D7033C /* libpng.framework */; }; @@ -1686,7 +1685,6 @@ 9BB7BA040D830473004FE8C3 /* uInputQueue.cpp in Sources */, 9BB7BA060D830473004FE8C3 /* uMenu.cpp in Sources */, 9BCBDE440D91F7F30022855B /* tColor.cpp in Sources */, - 9BCBE3100D922EAE0022855B /* AAPaste.cpp in Sources */, 9B7CFE1F0EFCE74700126634 /* tResource.cpp in Sources */, 9B7CFE210EFCE74700126634 /* tResourceManager.cpp in Sources */, 9B7CFE230EFCE74700126634 /* tResourceType.cpp in Sources */, Modified: armagetronad/trunk/armagetronad/src/ui/uMenu.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/ui/uMenu.cpp 2008-12-20 09:06:33 UTC (rev 8672) +++ armagetronad/trunk/armagetronad/src/ui/uMenu.cpp 2008-12-20 09:33:14 UTC (rev 8673) @@ -28,11 +28,13 @@ #include "aa_config.h" -#ifdef MACOSX -# include "AAPaste.h" -# include <CoreFoundation/CoreFoundation.h> -#else -# include "scrap.h" +#ifndef DEDICATED +# ifdef MACOSX +# include "AAPaste.h" +# include <CoreFoundation/CoreFoundation.h> +# else +# include "scrap.h" +# endif #endif #include "tSysTime.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |