|
From: <cn...@us...> - 2009-05-26 02:51:43
|
Revision: 277
http://hgengine.svn.sourceforge.net/hgengine/?rev=277&view=rev
Author: cnlohr
Date: 2009-05-26 02:51:42 +0000 (Tue, 26 May 2009)
Log Message:
-----------
fix up stuff for modules to enable proper building
Modified Paths:
--------------
Mercury2/cnconfigure
Mercury2/src/MercuryNode.h
Modified: Mercury2/cnconfigure
===================================================================
--- Mercury2/cnconfigure 2009-05-26 02:23:47 UTC (rev 276)
+++ Mercury2/cnconfigure 2009-05-26 02:51:42 UTC (rev 277)
@@ -191,7 +191,7 @@
echo "CFLAGS=$CC_BASE $CFLAGS" >> Makefile
echo "LDFLAGS=$LDFLAGS" >> Makefile
echo "">>Makefile
-echo -e "all : \$(PROJ) library" >> Makefile
+echo -e "all : \$(PROJ) library allmodules" >> Makefile
echo -e "\$(PROJ) : \$(OBJ)" >> Makefile
echo -e "\tg++ -o \$@ \$^ \$(LDFLAGS)" >> Makefile
echo -e "help : " >> Makefile
@@ -216,11 +216,14 @@
# echo -e "\t@if \$(CC) \$(CFLAGS) -c -o \$@ \$<; then echo -e \"[\$\\\\\\\\033[32mOK\\\\\\\\033[0m]\"; else echo -e \"[\\\\\\\\033[31mFAIL\\\\\\\\033[0m]\"; fi" >> Makefile
done
+echo "allmodules :" >> Makefile
+echo -ne "\t(cd modules&&make&&cd ..)\n" >> Makefile
echo "clean:" >> Makefile
echo -ne "\trm -f " >> Makefile
for i in $FOLDERS; do
echo -ne "$i/*.o $i/*~ $i/core.* " >>Makefile
done
echo "\$(PROJ) \$(PROJ).so" >> Makefile
+echo -ne "\trm -f modules/*.so modules/*.o modules/*~\n" >>Makefile
Modified: Mercury2/src/MercuryNode.h
===================================================================
--- Mercury2/src/MercuryNode.h 2009-05-26 02:23:47 UTC (rev 276)
+++ Mercury2/src/MercuryNode.h 2009-05-26 02:51:42 UTC (rev 277)
@@ -93,7 +93,7 @@
MercuryNode* FactoryFunct##class() { return new class(); } \
Callback0R<MercuryNode*> factoryclbk##class( FactoryFunct##class ); \
bool GlobalRegisterSuccess##class = NodeFactory::GetInstance().RegisterFactoryCallback(#class, factoryclbk##class); \
- extern "C" { int Install##class() { printf( "Installing "#class ); return NodeFactory::GetInstance().RegisterFactoryCallback(#class, factoryclbk##class); } }
+ extern "C" { int Install##class() { printf( "Installing "#class "\n" ); NodeFactory::GetInstance().RegisterFactoryCallback(#class, factoryclbk##class); return 0; } }
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|