[Player-cvs] hxclientkit UmakefilKit_common_mac-unix,1.4,1.5
sehancher at helixcommunity.org sehancher at helixcommunity.orgUpdate of /cvsroot/player/hxclientkit
In directory cvs:/tmp/cvs-serv12019
Modified Files:
UmakefilKit_common_mac-unix
Log Message:
Include CHXClientEngineHelix.cpp for static builds instead of CHXClientEngineMac.cpp.
Index: UmakefilKit_common_mac-unix
===================================================================
RCS file: /cvsroot/player/hxclientkit/UmakefilKit_common_mac-unix,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- UmakefilKit_common_mac-unix 9 Mar 2005 23:13:31 -0000 1.4
+++ UmakefilKit_common_mac-unix 14 Jul 2005 00:20:27 -0000 1.5
@@ -51,8 +51,7 @@
'player/hxclientkit/pub/platform/mac',
'common/util/pub')
-project.AddModuleSources('player/hxclientkit/src/platform/mac/CHXClientEngineMac.cpp',
- 'player/hxclientkit/src/platform/mac/HXClientEngine.mm',
+project.AddModuleSources('player/hxclientkit/src/platform/mac/HXClientEngine.mm',
'player/hxclientkit/src/platform/mac/HXClientPlayer.mm',
'player/hxclientkit/src/platform/mac/HXErrorCodeStringsMac.c',
'player/hxclientkit/src/platform/mac/HXEventRecordUtils.m',
@@ -60,6 +59,13 @@
'common/util/HXErrorCodeStrings.c',
'player/hxclientkit/src/platform/mac/HXStringUtils.c')
+if project.BuildOption("nodll") or project.BuildOption("static"):
+ project.AddModuleIncludes('common/system/pub',
+ 'common/container/pub')
+ project.AddModuleSources('player/hxclientkit/src/CHXClientEngineHelix.cpp')
+else:
+ project.AddModuleSources('player/hxclientkit/src/platform/mac/CHXClientEngineMac.cpp')
+
if project.IsDefined("HELIX_FEATURE_REGISTRY") and project.IsDefined("HELIX_FEATURE_STATS"):
project.AddModuleSources('player/hxclientkit/src/platform/mac/CHXStatisticObserverBridge.mm')