Update of /cvsroot/player/hxclientkit
In directory cvs02.internal.helixcommunity.org:/tmp/cvs-serv5750

Modified Files:
      Tag: hxclient_1_5_0_cayenne
	UmakefilKitDll 
Added Files:
      Tag: hxclient_1_5_0_cayenne
	UmakefilKitDll_unix.pcf UmakefilKitDll_win32.pcf 
Log Message:
Modified by:  Eric Hyche (ehyche at real.com)
Reviewed by:  Bob Clark (bobclark at real.com)

Description
-----------------------------------
player/hxclientkit on 150Cay does not build on
Windows. There has been some community interest in hxclientkit
on Windows, and the purpose of this fix is just to get
it to build on Windows.

Changes: 

1) For some reason, UmakefilKitDll (one of the cross-platform
   sub-Umakefil's) directly included a unix subUmake, like this:

   safe_execfile('UmakefilKit_common')
   safe_execfile('UmakefilKit_common_unix')

   This inclusion of UmakefilKit_common_unix was moved
   to a new file UmakefilKitDll_unix.pcf which has only that one line.

2) For some reason, even though both the lib (UmakefileKit) and
   dll (UmakefilKitDll) versions of the build both include exactly
   the same source files (via UmakefilKit_common), the dll version
   tries to link to the lib version like this:

   project.AddModuleLibraries('player/hxclientkit[libhxclient]')

   This causes problems on Windows. It is also unnecessary since
   the dll version rebuilds exactly the same source files as the
   lib version.

3) Added a UmakefilKitDll_win32.pcf, which provides
   the necessary module libraries, system libraries, and
   guid file inclusions to build on Windows.

Note: The Umakefil's for player/hxclientkit are structured
much differently than I've ever seen. For instance, they
build the same files for lib and dll versions, instead
of building the lib-related files in the lib version
and then building only the dll-related files in the dll
version and linking back to the lib version. I'd like
to do a much more invasive restructuring of these build
system files, but I guess I'll reserve that for the HEAD.
For 150Cay, I'm trying to do just the minimum to get
it to build on Windows.

Files Modified
------------------------------
player/hxclientkit/UmakefilKitDll

Files Added
------------------------------
player/hxclientkit/UmakefilKitDll_unix.pcf
player/hxclientkit/UmakefilKitDll_win32.pcf
 
Branches
------------------------------
hxclient_1_5_0_cayenne only



--- NEW FILE: UmakefilKitDll_win32.pcf ---
# ***** BEGIN LICENSE BLOCK *****
# Source last modified: $Id: UmakefilKitDll_win32.pcf,v 1.1.2.1 2006/04/06 15:41:04 ehyche Exp $
# 
# Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
# 
# The contents of this file, and the files included with this file,
# are subject to the current version of the RealNetworks Public
# Source License (the "RPSL") available at
# http://www.helixcommunity.org/content/rpsl unless you have licensed
# the file under the current version of the RealNetworks Community
# Source License (the "RCSL") available at
# http://www.helixcommunity.org/content/rcsl, in which case the RCSL
# will apply. You may also obtain the license terms directly from
# RealNetworks.  You may not use this file except in compliance with
# the RPSL or, if you have a valid RCSL with RealNetworks applicable
# to this file, the RCSL.  Please see the applicable RPSL or RCSL for
# the rights, obligations and limitations governing use of the
# contents of the file.
# 
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 or later (the
# "GPL") in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your version of
# this file only under the terms of the GPL, and not to allow others
# to use your version of this file under the terms of either the RPSL
# or RCSL, indicate your decision by deleting the provisions above
# and replace them with the notice and other provisions required by
# the GPL. If you do not delete the provisions above, a recipient may
# use your version of this file under the terms of any one of the
# RPSL, the RCSL or the GPL.
# 
# This file is part of the Helix DNA Technology. RealNetworks is the
# developer of the Original Code and owns the copyrights in the
# portions it created.
# 
# This file, and the files included with this file, is distributed
# and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
# KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
# ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
# ENJOYMENT OR NON-INFRINGEMENT.
# 
# Technology Compatibility Kit Test Suite(s) Location:
#    http://www.helixcommunity.org/content/tck
# 
# Contributor(s):
# 
# ***** END LICENSE BLOCK *****
# 

project.AddModuleLibraries("common/dbgtool[debuglib]",
                           "common/system[syslib]",
                           "common/container[contlib]",
                           "common/runtime[runtlib]")

project.AddSources("src/HXClientGuids.cpp")

if project.BuildOption("nodll") or project.BuildOption("static"):
    project.AddSources("src/CHXClientEngineHelix.cpp")
else:
    project.AddSources("src/platform/win/CHXClientEngineWin.cpp")

project.AddSystemLibraries("version.lib",
                           "wsock32.lib",
                           "kernel32.lib",
                           "user32.lib",
                           "advapi32.lib",
                           "vfw32.lib",
                           "ole32.lib")

Index: UmakefilKitDll
===================================================================
RCS file: /cvsroot/player/hxclientkit/Attic/UmakefilKitDll,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- UmakefilKitDll	21 Oct 2005 18:42:39 -0000	1.1.2.1
+++ UmakefilKitDll	6 Apr 2006 15:41:04 -0000	1.1.2.2
@@ -49,7 +49,6 @@
 # 
 
 safe_execfile('UmakefilKit_common')
-safe_execfile('UmakefilKit_common_unix')
 
 project.ExportFunction('ClientEngineSetCallbacks',
 	'const HXClientEngineCallbacks* pClientEngineCallbacks',
@@ -388,8 +387,6 @@
 
 project.AddModuleIncludes('player/hxclientkit/pub')
 
-project.AddModuleLibraries('player/hxclientkit[libhxclient]')
-
 project.SetDLLTypeCommon()
 DLLTarget('libhxclient')
 DependTarget()

--- NEW FILE: UmakefilKitDll_unix.pcf ---
# ***** BEGIN LICENSE BLOCK *****
# Source last modified: $Id: UmakefilKitDll_unix.pcf,v 1.1.2.1 2006/04/06 15:41:04 ehyche Exp $
# 
# Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
# 
# The contents of this file, and the files included with this file,
# are subject to the current version of the RealNetworks Public
# Source License (the "RPSL") available at
# http://www.helixcommunity.org/content/rpsl unless you have licensed
# the file under the current version of the RealNetworks Community
# Source License (the "RCSL") available at
# http://www.helixcommunity.org/content/rcsl, in which case the RCSL
# will apply. You may also obtain the license terms directly from
# RealNetworks.  You may not use this file except in compliance with
# the RPSL or, if you have a valid RCSL with RealNetworks applicable
# to this file, the RCSL.  Please see the applicable RPSL or RCSL for
# the rights, obligations and limitations governing use of the
# contents of the file.
# 
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 or later (the
# "GPL") in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your version of
# this file only under the terms of the GPL, and not to allow others
# to use your version of this file under the terms of either the RPSL
# or RCSL, indicate your decision by deleting the provisions above
# and replace them with the notice and other provisions required by
# the GPL. If you do not delete the provisions above, a recipient may
# use your version of this file under the terms of any one of the
# RPSL, the RCSL or the GPL.
# 
# This file is part of the Helix DNA Technology. RealNetworks is the
# developer of the Original Code and owns the copyrights in the
# portions it created.
# 
# This file, and the files included with this file, is distributed
# and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
# KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
# ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
# ENJOYMENT OR NON-INFRINGEMENT.
# 
# Technology Compatibility Kit Test Suite(s) Location:
#    http://www.helixcommunity.org/content/tck
# 
# Contributor(s):
# 
# ***** END LICENSE BLOCK *****
# 

safe_execfile('UmakefilKit_common_unix')