[wpdev-commits] wolfpack wolf.dsp,1.271,1.272
Brought to you by:
rip,
thiagocorrea
From: spddmn <xxx...@us...> - 2004-09-02 17:20:09
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14706 Modified Files: wolf.dsp Log Message: removed twofish.c, added twofish.cpp added some new python files updated linker config to use QTLib 3.31 instead of 3.22 Works with Python 2.3.4 Moved initial output of .exe to DEBUG or RELEASE subdirectory instead of to ..\wolfpack.exe Added post build step "Automove" for debug config. you should configure this to move your debug output to your working debug server directory Index: wolf.dsp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v retrieving revision 1.271 retrieving revision 1.272 diff -C2 -d -r1.271 -r1.272 *** wolf.dsp 31 Aug 2004 19:16:49 -0000 1.271 --- wolf.dsp 2 Sep 2004 17:19:59 -0000 1.272 *************** *** 8,24 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "wolf.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "wolf - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "wolf - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE # Begin Project --- 8,24 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "wolf.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "wolf - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "wolf - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE # Begin Project *************** *** 43,50 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MD /GR /GX /O2 /I "lib/Python/PC" /I "sqlite" /I "lib/Python/include" /I "lib\ZThread\include" /I "$(QTDIR)\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "QT_DLL" /D "QT_NO_STL" /D "QT_THREAD_SUPPORT" /Fr /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" ! # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 43,50 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "lib/Python/PC" /I "sqlite" /I "lib/Python/include" /I "lib\ZThread\include" /I "$(QTDIR)\include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "QT_DLL" /D "QT_NO_STL" /D "QT_THREAD_SUPPORT" /Fr /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" ! # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 52,56 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib advapi32.lib ws2_32.lib comctl32.lib $(QTDIR)\lib\qt-mt322.lib shell32.lib /nologo /subsystem:windows /map /machine:I386 /out:"..\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98 # SUBTRACT LINK32 /pdb:none --- 52,56 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib advapi32.lib ws2_32.lib comctl32.lib $(QTDIR)\lib\qt-mt331.lib shell32.lib /nologo /subsystem:windows /map /machine:I386 /out:"release\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98 # SUBTRACT LINK32 /pdb:none *************** *** 64,73 **** # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /MD /Gm /GR /GX /Zi /Od /I "sqlite" /I "lib\bugreport" /I "$(QTDIR)\include" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "WIN32" /D "QT_DLL" /D "QT_NO_STL" /D "QT_THREAD_SUPPORT" /Fr /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 64,73 ---- # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /MD /W3 /Gm /GR /GX /Zi /Od /I "sqlite" /I "lib\bugreport" /I "$(QTDIR)\include" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "WIN32" /D "QT_DLL" /D "QT_NO_STL" /D "QT_THREAD_SUPPORT" /Fr /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 77,84 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt322.lib shell32.lib /nologo /version:12.9 /subsystem:windows /incremental:no /debug /machine:I386 /out:"..\wolfpack.exe" /pdbtype:sept /fixed:no # SUBTRACT LINK32 /pdb:none /map ! !ENDIF # Begin Target --- 77,89 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt331.lib shell32.lib /nologo /version:12.9 /subsystem:windows /incremental:no /debug /machine:I386 /out:"debug\wolfpack.exe" /pdbtype:sept /fixed:no # SUBTRACT LINK32 /pdb:none /map + # Begin Special Build Tool + SOURCE="$(InputPath)" + PostBuild_Desc=MoveIt + PostBuild_Cmds=copy debug\wolfpack.exe d:\wolfpack\wolfpackEXE\WolfpackDebug\WolfpackCurrent\wolfpack.exe + # End Special Build Tool ! !ENDIF # Begin Target *************** *** 135,142 **** # Begin Source File - SOURCE=.\serverconfig.cpp - # End Source File - # Begin Source File - SOURCE=.\win\config_win.cpp # End Source File --- 140,143 ---- *************** *** 271,274 **** --- 272,279 ---- # Begin Source File + SOURCE=.\serverconfig.cpp + # End Source File + # Begin Source File + SOURCE=.\skills.cpp # End Source File *************** *** 311,315 **** # Begin Source File ! SOURCE=.\twofish\TWOFISH2.C # End Source File # Begin Source File --- 316,320 ---- # Begin Source File ! SOURCE=.\twofish\twofish2.cpp # End Source File # Begin Source File *************** *** 374,381 **** # Begin Source File - SOURCE=.\serverconfig.h - # End Source File - # Begin Source File - SOURCE=.\console.h # End Source File --- 379,382 ---- *************** *** 484,491 **** # Begin Source File - SOURCE=.\python\pyaction.h - # End Source File - # Begin Source File - SOURCE=.\pagesystem.h # End Source File --- 485,488 ---- *************** *** 540,543 **** --- 537,544 ---- # Begin Source File + SOURCE=.\serverconfig.h + # End Source File + # Begin Source File + SOURCE=.\singleton.h # End Source File *************** *** 688,692 **** # PROP Ignore_Default_Tool 1 ! !ENDIF # End Source File --- 689,693 ---- # PROP Ignore_Default_Tool 1 ! !ENDIF # End Source File *************** *** 709,716 **** # Begin Source File - SOURCE=.\python\pyaction.cpp - # End Source File - # Begin Source File - SOURCE=.\python\content.h # End Source File --- 710,713 ---- *************** *** 741,744 **** --- 738,749 ---- # Begin Source File + SOURCE=.\python\pyaction.cpp + # End Source File + # Begin Source File + + SOURCE=.\python\pyaction.h + # End Source File + # Begin Source File + SOURCE=.\python\pyai.cpp # End Source File |