|
From: Correa <thi...@us...> - 2004-08-23 19:36:14
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271 Modified Files: .cvsignore configure.py wolfpack.pro Log Message: cleaned up build system and fixed problem with configure.py under windows Index: .cvsignore =================================================================== RCS file: /cvsroot/wpdev/wolfpack/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .cvsignore 17 Aug 2004 19:39:41 -0000 1.4 --- .cvsignore 23 Aug 2004 19:35:31 -0000 1.5 *************** *** 6,13 **** Release Debug ! vc70.idb wolfpack.suo wolfpack.ncb ! vc70.pdb wolfpack.exe wolfpack --- 6,13 ---- Release Debug ! vc*.idb wolfpack.suo wolfpack.ncb ! vc*.pdb wolfpack.exe wolfpack Index: wolfpack.pro =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v retrieving revision 1.207 retrieving revision 1.208 diff -C2 -d -r1.207 -r1.208 *** wolfpack.pro 23 Aug 2004 15:58:21 -0000 1.207 --- wolfpack.pro 23 Aug 2004 19:35:31 -0000 1.208 *************** *** 25,29 **** MOC_DIR = obj - INCLUDEPATH += sqlite win32:DEFINES -= UNICODE --- 25,28 ---- *************** *** 34,42 **** # Precompiled header ! precompile_header:PRECOMPILED_HEADER = wolfpack_pch.h # Common files ! HEADERS = \ accounts.h \ basechar.h \ --- 33,65 ---- # Precompiled header ! precompile_header { ! # PRECOMPILED_HEADER = wolfpack_pch.h ! INCLUDEPATH += obj ! } ! ! SQLITE_CPP = sqlite ! SQLITE_H = sqlite ! PYTHON_CPP = python ! PYTHON_H = python ! NETWORK_H = network ! NETWORK_CPP = network ! AI_H = ai ! AI_CPP = ai ! MULS_H = muls ! MULS_CPP = muls + DEPENDPATH += ;$$SQLITE_H;$$PYTHON_H;$$NETWORK_H;$$AI_H;$$MULS_H;. + INCLUDEPATH += $$SQLITE_H + + + #modules + include($$PYTHON_CPP/python.pri) + include($$SQLITE_CPP/sqlite.pri) + include($$NETWORK_CPP/network.pri) + include($$AI_CPP/ai.pri) + include($$MULS_CPP/muls.pri) # Common files ! HEADERS += \ accounts.h \ basechar.h \ *************** *** 57,61 **** definitions.h \ dragdrop.h \ - network/encryption.h \ exceptions.h \ factory.h \ --- 80,83 ---- *************** *** 66,74 **** items.h \ log.h \ - muls/maps.h \ md5.h \ multi.h \ - muls/multiscache.h \ - network/network.h \ npc.h \ pagesystem.h \ --- 88,93 ---- *************** *** 91,95 **** targetrequests.h \ territories.h \ - muls/tilecache.h \ timing.h \ timers.h \ --- 110,113 ---- *************** *** 103,107 **** world.h ! SOURCES = \ accounts.cpp \ basechar.cpp \ --- 121,125 ---- world.h ! SOURCES += \ accounts.cpp \ basechar.cpp \ *************** *** 120,124 **** definitions.cpp \ dragdrop.cpp \ - network/encryption.cpp \ getopts.cpp \ guilds.cpp \ --- 138,141 ---- *************** *** 126,134 **** items.cpp \ log.cpp \ - muls/maps.cpp \ md5.cpp \ multi.cpp \ - muls/multiscache.cpp \ - network/network.cpp \ npc.cpp \ party.cpp \ --- 143,148 ---- *************** *** 146,150 **** targetrequests.cpp \ territories.cpp \ - muls/tilecache.cpp \ timing.cpp \ timers.cpp \ --- 160,163 ---- *************** *** 158,254 **** SOURCES += twofish/twofish2.c - # Network Module - # THIS IS IMPORTANT FOR MOCING! - HEADERS += \ - network/asyncnetio.h \ - network/listener.h \ - network/uopacket.h \ - network/uorxpackets.h \ - network/uosocket.h \ - network/uotxpackets.h - - SOURCES += \ - network/asyncnetio.cpp \ - network/listener.cpp \ - network/uopacket.cpp \ - network/uorxpackets.cpp \ - network/uosocket.cpp \ - network/uotxpackets.cpp - - # AI Module - HEADERS += ai/ai.h - - SOURCES += \ - ai/ai.cpp \ - ai/ai_animals.cpp \ - ai/ai_humans.cpp \ - ai/ai_monsters.cpp - - # Python Module - SOURCES += \ - python/char.cpp \ - python/engine.cpp \ - python/global.cpp \ - python/item.cpp \ - python/pyaccount.cpp \ - python/pyai.cpp \ - python/pycoord.cpp \ - python/pypacket.cpp \ - python/pyspawnregion.cpp \ - python/pyregion.cpp \ - python/pytooltip.cpp \ - python/socket.cpp \ - python/worlditerator.cpp - - HEADERS += \ - python/content.h \ - python/worlditerator.h - - # SQLite Sources - SOURCES += \ - sqlite/attach.c \ - sqlite/auth.c \ - sqlite/btree.c \ - sqlite/btree_rb.c \ - sqlite/build.c \ - sqlite/copy.c \ - sqlite/date.c \ - sqlite/delete.c \ - sqlite/expr.c \ - sqlite/func.c \ - sqlite/hash.c \ - sqlite/insert.c \ - sqlite/main.c \ - sqlite/opcodes.c \ - sqlite/os.c \ - sqlite/pager.c \ - sqlite/parse.c \ - sqlite/pragma.c \ - sqlite/printf.c \ - sqlite/random.c \ - sqlite/select.c \ - sqlite/table.c \ - sqlite/tokenize.c \ - sqlite/trigger.c \ - sqlite/update.c \ - sqlite/util.c \ - sqlite/vacuum.c \ - sqlite/vdbe.c \ - sqlite/vdbeaux.c \ - sqlite/where.c - - HEADERS += \ - sqlite/btree.h \ - sqlite/config.h \ - sqlite/hash.h \ - sqlite/opcodes.h \ - sqlite/os.h \ - sqlite/pager.h \ - sqlite/parse.h \ - sqlite/sqlite.h \ - sqlite/sqliteInt.h \ - sqlite/vdbe.h \ - sqlite/vdbeInt.h - INTERFACES = TRANSLATIONS = \ --- 171,174 ---- Index: configure.py =================================================================== RCS file: /cvsroot/wpdev/wolfpack/configure.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** configure.py 23 Aug 2004 15:58:21 -0000 1.29 --- configure.py 23 Aug 2004 19:35:31 -0000 1.30 *************** *** 54,58 **** if sys.platform == "win32": ! return path + os.path.pathsep + file else: if file[0:3] == "lib": --- 54,58 ---- if sys.platform == "win32": ! return path + os.path.sep + file else: if file[0:3] == "lib": *************** *** 165,170 **** def checkPython(options): ! PYTHONINCSEARCHPATH = [ distutils.sysconfig.get_python_inc() ] ! PYTHONLIBSEARCHPATH = [ distutils.sysconfig.get_config_vars()["DESTSHARED"] + os.path.sep + "libpython*" ] PYTHONLIBSTATICSEARCHPATH = [] if sys.platform == "win32": --- 165,173 ---- def checkPython(options): ! PYTHONINCSEARCHPATH = [ distutils.sysconfig.get_python_inc() + os.path.sep + "Python.h" ] ! if distutils.sysconfig.get_config_vars().has_key("DESTSHARED"): ! PYTHONLIBSEARCHPATH = [ distutils.sysconfig.get_config_vars()["DESTSHARED"] + os.path.sep + "libpython*" ] ! else: ! PYTHONLIBSEARCHPATH = [] PYTHONLIBSTATICSEARCHPATH = [] if sys.platform == "win32": *************** *** 265,269 **** # Setup command line parser ! parser = OptionParser(version="%prog 0.1") parser.add_option("--dsp", action="store_true", dest="dsp", help="also Generate Visual Studio project files") parser.add_option("--nocolor", action="store_true", dest="nocolor", help="disable color output support on this script") --- 268,272 ---- # Setup command line parser ! parser = OptionParser(version="%prog 0.2") parser.add_option("--dsp", action="store_true", dest="dsp", help="also Generate Visual Studio project files") parser.add_option("--nocolor", action="store_true", dest="nocolor", help="disable color output support on this script") *************** *** 277,281 **** (options, args) = parser.parse_args() ! if options.nocolor: nocolor() --- 280,284 ---- (options, args) = parser.parse_args() ! if options.nocolor or sys.platform == "win32": nocolor() *************** *** 314,318 **** if options.enable_debug: DEFINES += "_DEBUG " ! CONFIG += "debug " # if --aidebug if options.enable_aidebug: --- 317,325 ---- if options.enable_debug: DEFINES += "_DEBUG " ! CONFIG += "debug warn_on " ! else: ! CONFIG += "release warn_off " ! ! # if --aidebug if options.enable_aidebug: |
