diff options
| author | pixel <pixel> | 2003-12-26 19:58:13 +0000 |
|---|---|---|
| committer | pixel <pixel> | 2003-12-26 19:58:13 +0000 |
| commit | 47b21c600265c30f679861f8c460784530f52354 (patch) | |
| tree | ad0c9261b2cfd7d6601dcc91310689ed8c9cf103 | |
| parent | 6ad8619941b8eb79d7ad1d7fe1cf75012fb870d0 (diff) | |
Fixed GC and some related problems.
| -rw-r--r-- | MSVC/Baltisot - generic/Baltisot - generic.vcproj | 2 | ||||
| -rw-r--r-- | MSVC/Tools/Tools.vcproj | 3 | ||||
| -rw-r--r-- | PE/compil.lex | 2 | ||||
| -rw-r--r-- | lib/isobuilder.cpp | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj index 40d20c2..f57638d 100644 --- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj +++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj @@ -57,7 +57,7 @@ Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="TRUE"
- AdditionalIncludeDirectories="..\..\generic\include;..\..\..\zlib"
+ AdditionalIncludeDirectories="..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include"
PreprocessorDefinitions="_WINDOWS;ZLIB_DLL"
StringPooling="TRUE"
RuntimeLibrary="4"
diff --git a/MSVC/Tools/Tools.vcproj b/MSVC/Tools/Tools.vcproj index 1ba289f..b2aef74 100644 --- a/MSVC/Tools/Tools.vcproj +++ b/MSVC/Tools/Tools.vcproj @@ -134,6 +134,9 @@ RelativePath="..\..\PE\nmakefile">
</File>
<File
+ RelativePath="..\..\PE\pe-hack.lua">
+ </File>
+ <File
RelativePath="..\..\PE\pepatch-res.h">
</File>
<File
diff --git a/PE/compil.lex b/PE/compil.lex index bc6614d..8d15631 100644 --- a/PE/compil.lex +++ b/PE/compil.lex @@ -10,9 +10,9 @@ "<NBPTS "[[:digit:]]+">\n" { int i; + int z = 0; nbpts = atoi(yytext + 7); fprintf(stderr, "nbpts = %i\n", nbpts); - unsigned short int z = 0; fwrite(&nbpts, 2, 1, yyout); diff --git a/lib/isobuilder.cpp b/lib/isobuilder.cpp index f8d8bfa..7928737 100644 --- a/lib/isobuilder.cpp +++ b/lib/isobuilder.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: isobuilder.cpp,v 1.9 2003-12-11 16:53:43 pixel Exp $ */ +/* $Id: isobuilder.cpp,v 1.10 2003-12-26 19:58:13 pixel Exp $ */ #include "isobuilder.h" @@ -456,7 +456,7 @@ int isobuilder::getdispsect() { int isobuilder::putfile(Handle * file, int mode, int n) { Byte datas[2352]; - size_t filesize; + ssize_t filesize; int fsect; if (mode < 0) |