[TeamTalk 227]: [763] trunk/TeamTalk: 1) Import minor build changes for boeingLib from integration repository.

[tk@edam.speech.cs.cmu.edu]

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20070922/e0d4dec7/attachment.html
-------------- next part --------------
Modified: trunk/TeamTalk/Libraries/boeingLib/Makefile
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/Makefile	2007-09-22 04:45:17 UTC (rev 762)
+++ trunk/TeamTalk/Libraries/boeingLib/Makefile	2007-09-22 05:11:09 UTC (rev 763)
@@ -25,7 +25,7 @@
 # Compilation options
 #======================================================================#
 
-CC := g++-3.4
+CC := g++-4.1
 
 # CFlags base
 CFLAGS += -Wall -D_GNU_SOURCE

Modified: trunk/TeamTalk/Libraries/boeingLib/Makefile.config
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/Makefile.config	2007-09-22 04:45:17 UTC (rev 762)
+++ trunk/TeamTalk/Libraries/boeingLib/Makefile.config	2007-09-22 05:11:09 UTC (rev 763)
@@ -1,4 +1,4 @@
 # Directory where lib and include directories will be placed
 # For system wide usual use /usr/local/
 
-INSTALLDIR=~/software/external/boeingLib
+INSTALLDIR=~/rCommerce/software/external/boeingLib

Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/configreader.h
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/coralshared/configreader.h	2007-09-22 04:45:17 UTC (rev 762)
+++ trunk/TeamTalk/Libraries/boeingLib/coralshared/configreader.h	2007-09-22 05:11:09 UTC (rev 763)
@@ -179,7 +179,7 @@
   DataMap *FindDataMapping(char *_fname, char *_dataname, int _type);
 
   // Update a data mapping (also used when first added)
-  bool ConfigReader::UpdateDataMap(PDataMap dmap);
+  bool UpdateDataMap(PDataMap dmap);
 
   // Add a new data mapping and also sanity check the number of vectors
   DataMap *FindDataMapping(char *_fname, char *_dataname, int _type, 

Modified: trunk/TeamTalk/TeamTalkBuild.bat
===================================================================
--- trunk/TeamTalk/TeamTalkBuild.bat	2007-09-22 04:45:17 UTC (rev 762)
+++ trunk/TeamTalk/TeamTalkBuild.bat	2007-09-22 05:11:09 UTC (rev 763)
@@ -50,7 +50,11 @@
 
 ::Check for cygwin
 echo Looking for Cygwin...
-IF not exist "%CYGWIN_DIR%\bin\cygwin1.dll" goto CYGERR
+IF NOT EXIST "%windir%\system32\cygwin1.dll" goto CYG_CHK2
+goto JAVACHK
+
+:CYG_CHK2
+IF NOT EXIST "%CYGWIN_DIR%\bin\cygwin1.dll" goto CYGERR
 echo Found Cygwin.
 
 :JAVACHK
@@ -91,6 +95,7 @@
 IF NOT EXIST "%JAVA_HOME%\bin\javac.exe" goto JAVAERROR
 
 :ANTCHK
+echo Looking for NetBeans...
 FOR %%d in (C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, A, B) DO IF EXIST "%%d:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" goto NB%%d
 goto NETBEANSERROR
 
@@ -180,10 +185,10 @@
 
 :: Do Not build TeamTalk Tools as there is nothing to build.
 :TOOLS build
-REM echo Building TeamTalk Tools -- This may take 1-3 Minutes, Please Wait..
-REM cd Tools
-REM CALL "%VSHome%\devenv" Tools.sln /%BUILD_TYPE% %BUILD_CONF%
-REM cd ..
+::echo Building TeamTalk Tools -- This may take 1-3 Minutes, Please Wait..
+::cd Tools
+::CALL "%VSHome%\devenv" Tools.sln /%BUILD_TYPE% %BUILD_CONF%
+::cd ..
 
 :Ant Compilation
 :JBUILD