Permalink
Browse files

rewritten main Sconstruct script, added begin of documentation in lyx

  • Loading branch information...
1 parent 2f37706 commit 774f0ccaf28d12d71d9b24b57e3563513383782f Daniel (dmilith) Dettlaff committed Sep 26, 2008
Showing with 961 additions and 89 deletions.
  1. +1 −0 CleanAll
  2. +1 −1 MakeAllLibs
  3. +1 −1 MakeAllTests
  4. +25 −17 Sconstruct
  5. +0 −1 character.cpp
  6. +5 −0 core.cpp
  7. BIN docs/hexagon.png
  8. +411 −0 docs/world.lyx
  9. +444 −0 docs/world.lyx,v
  10. BIN hashlib/libhl_sha256wrapper.cpp
  11. +71 −67 tests/Sconstruct
  12. +2 −2 version.h
View
@@ -7,5 +7,6 @@ rm -f test_*
rm -f main
cd tests/
scons -c
+rm -f test_*
echo "Done."
View
@@ -1,6 +1,6 @@
#! /bin/bash
-scons 2> compile.log
+time scons 2> compile.log
if [ $? = 0 ]; then
echo "done. ready"
View
@@ -1,6 +1,6 @@
#! /bin/bash
-if [ -e "libhl-sha.so" ]; then
+if [ -e "libpurecore.so" ]; then
cd tests/
scons
View
@@ -8,30 +8,38 @@ You can redistribute this project only with this header.
"""
import os
-print 'scons script written by dmilith[at]gmail[dot]com (c) 2oo8'
+print 'scons script written by Daniel (dmilith[at]gmail[dot]com) Dettlaff (c) 2oo8'
-release32 = Environment( CXX = 'g++ -m32 -Os -march=athlon64' )
+release32 = Environment( CXX = 'g++ -m32 -Os -march=athlon64', tools = ["default", "PrecompiledHeadersBuilder"] )
release64 = Environment( CXX = 'g++ -O2 -march=athlon64' )
debug32 = Environment( CXX = 'g++ -m32 -O0 -ggdb -W' )
debug64 = Environment( CXX = 'g++ -O0 -ggdb -W' )
-debug_optimized = Environment( CXX = 'g++ -O2 -ggdb -W' )
+debug_optimized = Environment( CXX = 'ccache g++ -Os -march=athlon64 -fpch-preprocess', tools =["default", "PrecompiledHeadersBuilder"] )
-#release = debug64
+# my_options = '-fpreprocessed -fsched-spec -fsched-spec-load -fsched-spec-load-dangerous -fsched-verbose=3 -fschedule-insns -pedantic-errors -fpch-preprocess -fexceptions -funit-at-a-time'
+
+# release = debug64
release = debug_optimized
+release_multi_libs = { 'purehl-sha': [ 'hashlib/hl_sha256wrapper.cpp',
+ 'hashlib/hl_tools.cpp',
+ 'hashlib/hl_sha1.cpp',
+ 'hashlib/hl_sha1wrapper.cpp',
+ 'hashlib/hl_sha256.cpp' ],
+ 'purecore': [ 'core.cpp' ],
+ 'puresoul': [ 'soul.cpp' ],
+ 'purecharacter': [ 'character.cpp' ],
+ 'purejob': [ 'job.cpp' ],
+ 'purecoordinates': [ 'coordinates.cpp' ],
+ 'pureitem': [ 'item.cpp' ],
+ 'puremap': [ 'map.cpp' ],
+ 'pureplace': [ 'place.cpp' ],
+ 'puretheritory': [ 'theritory.cpp' ],
+ 'pureworld': [ 'world.cpp' ]
+ }
+
+for rl, rll in release_multi_libs.iteritems():
+ release.SharedLibrary( rl, rll )
-release.SharedLibrary('purecore', 'core.cpp')
-release.SharedLibrary('job', 'job.cpp')
-release.SharedLibrary('hl-sha', [ 'hashlib/hl_sha1.cpp',
- 'hashlib/hl_sha1wrapper.cpp', 'hashlib/hl_sha256.cpp',
- 'hashlib/hl_sha256wrapper.cpp', 'hashlib/hl_tools.cpp' ] )
-release.SharedLibrary('character', 'character.cpp')
-release.SharedLibrary('coordinates', 'coordinates.cpp')
-release.SharedLibrary('item', 'item.cpp')
-release.SharedLibrary('map', 'map.cpp')
-release.SharedLibrary('place', 'place.cpp')
-release.SharedLibrary('soul', 'soul.cpp')
-release.SharedLibrary('theritory', 'theritory.cpp')
-release.SharedLibrary('world', 'world.cpp')
#release.Program('main' , 'main2.cpp',
# LIBS=[ 'boost_thread', 'boost_filesystem', 'hl-sha', 'boost_serialization',
# 'job', 'character', 'coordinates',
View
@@ -9,7 +9,6 @@
#include "character.h"
-
Ccharacter::Ccharacter( std::string new_name ) {
name = new_name; // creature name
race = human; //(0)
View
@@ -24,16 +24,21 @@ using namespace boost;
//Ccore
Ccore::Ccore() {
+ cout << "Core Init." << endl << flush;
}
Ccore::~Ccore() {
+ cout << "Core UnInit." << endl << flush;
}
string
Ccore::get_core_version() {
return CREALIS_CORE_VERSION;
+#ifdef DEBUG
+ cout << "GettingCoreVersion." << endl << flush;
+#endif
}
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit 774f0cc

Please sign in to comment.