Add: README and update daomake files.

daokoder · May 26, 2013 · 46af1ad · 46af1ad
1 parent 2e91e93
commit 46af1ad
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 16 deletions.
diff --git a/DaoCXX/makefile.dao b/DaoCXX/makefile.dao
@@ -6,7 +6,7 @@ llvm  = DaoMake::FindPackage( "LLVM", $REQUIRED )
 
 if( daovm == none || llvm == none ) return
 
-project.UseSharedLibrary( daovm, "dao" )
+project.UseImportLibrary( daovm, "dao" )
 project.UseSharedLibrary( llvm )
 
 project_objects = project.AddObjects( { "daoCXX.cpp" } )

diff --git a/DaoJIT/makefile.dao b/DaoJIT/makefile.dao
@@ -6,7 +6,7 @@ llvm  = DaoMake::FindPackage( "LLVM", $REQUIRED )
 
 if( daovm == none || llvm == none ) return
 
-project.UseSharedLibrary( daovm, "dao" )
+project.UseImportLibrary( daovm, "dao" )
 project.UseSharedLibrary( llvm )
 
 project_objs = project.AddObjects( { "daoJIT.cpp" }, { "daoJIT.h" } )

diff --git a/README b/README
@@ -0,0 +1,7 @@
+Dao Standard Modules
+
+This is a collection of standard Dao modules that are developed
+separately from the Dao virtual machine and the core modules.
+
+To compile these modules, they should be placed under dao/modules,
+then they can be compiled along with Dao.
diff --git a/graph/makefile.dao b/graph/makefile.dao
@@ -5,7 +5,7 @@ daovm = DaoMake::FindPackage( "Dao", $REQUIRED )
 
 if( daovm == none ) return
 
-project.UseSharedLibrary( daovm, "dao" )
+project.UseImportLibrary( daovm, "dao" )
 
 project_objs = project.AddObjects( { "dao_graph.c" }, { "dao_graph.h" } )
 project_dll  = project.AddSharedLibrary( "dao_graph", project_objs )

diff --git a/graphics/makefile.dao b/graphics/makefile.dao
@@ -1,14 +1,14 @@
 
-project = DaoMake::Project( "DaoGraphics" ) 
+project = DaoMake::Project( "graphics" ) 
 
 daovm  = DaoMake::FindPackage( "Dao",    $REQUIRED )
-opengl = DaoMake::FindPackage( "OpenGL", $REQUIRED )
-glut   = DaoMake::FindPackage( "GLUT",   $REQUIRED ) # TODO: make it optional;
+opengl = DaoMake::FindPackage( "OpenGL", $OPTIONAL )
+glut   = DaoMake::FindPackage( "GLUT",   $OPTIONAL )
 
 if( daovm == none or opengl == none ) return
-if( glut == none ) return
+if( glut == none ) return # TODO: make it optional;
 
-project.UseSharedLibrary( daovm )
+project.UseImportLibrary( daovm )
 project.UseSharedLibrary( opengl )
 if( glut ) project.UseSharedLibrary( glut )
 
@@ -20,8 +20,7 @@ project_headers =
 	"dao_triangulator.h" ,
 	"dao_font.h" ,
 	"dao_image.h" ,
-	"dao_opengl.h" ,
-	"dao_glut.h"
+	"dao_opengl.h" 
 }
 
 project_sources = 

diff --git a/net/makefile.dao b/net/makefile.dao
@@ -5,7 +5,7 @@ daovm = DaoMake::FindPackage( "Dao", $REQUIRED )
 
 if( daovm == none ) return
 
-project.UseSharedLibrary( daovm )
+project.UseImportLibrary( daovm )
 
 project_objs = project.AddObjects( { "dao_network.c" } )
 project_dll  = project.AddSharedLibrary( "dao_net", project_objs )

diff --git a/os/makefile.dao b/os/makefile.dao
@@ -5,7 +5,7 @@ daovm = DaoMake::FindPackage( "Dao", $REQUIRED )
 
 if( daovm == none ) return
 
-project.UseSharedLibrary( daovm, "dao" )
+project.UseImportLibrary( daovm, "dao" )
 
 dao_fs_objs = project.AddObjects( { "fs/dao_fs.c" } )
 dao_fs_dll  = project.AddSharedLibrary( "dao_fs", dao_fs_objs )

diff --git a/stream/makefile.dao b/stream/makefile.dao
@@ -6,7 +6,7 @@ daosys = DaoMake::FindPackage( "DaoSys", $REQUIRED )
 
 if( daovm == none or daosys == none ) return
 
-project.UseSharedLibrary( daovm, "dao" )
+project.UseImportLibrary( daovm, "dao" )
 
 dao_buffer_objs  = project.AddObjects( { "buffer/dao_buffer.c" } )
 dao_clprint_objs = project.AddObjects( { "clprint/dao_clprint.c" } )

diff --git a/string/makefile.dao b/string/makefile.dao
@@ -5,7 +5,7 @@ daovm = DaoMake::FindPackage( "Dao", $REQUIRED )
 
 if( daovm == none ) return
 
-project.UseSharedLibrary( daovm, "dao" )
+project.UseImportLibrary( daovm, "dao" )
 
 dao_format_objects   = project.AddObjects( { "format/dao_format.c" } )
 dao_md5_objects      = project.AddObjects( { "md5/dao_md5.c" } )

diff --git a/sync/makefile.dao b/sync/makefile.dao
@@ -5,7 +5,7 @@ daovm = DaoMake::FindPackage( "Dao", $REQUIRED )
 
 if( daovm == none ) return
 
-project.UseSharedLibrary( daovm, "dao" )
+project.UseImportLibrary( daovm, "dao" )
 
 project_objs = project.AddObjects( { "dao_sync.c" } )
 project_dll  = project.AddSharedLibrary( "dao_sync", project_objs )

diff --git a/web/makefile.dao b/web/makefile.dao
@@ -5,7 +5,7 @@ daovm = DaoMake::FindPackage( "Dao", $REQUIRED )
 
 if( daovm == none ) return
 
-project.UseSharedLibrary( daovm, "dao" )
+project.UseImportLibrary( daovm, "dao" )
 
 dao_cgi_objs  = project.AddObjects( { "cgi/dao_cgi.c" } )
 dao_json_objs = project.AddObjects( { "json/dao_json.c" } )