From d397619939241a446d04297599bacf0f699cb7dd Mon Sep 17 00:00:00 2001 From: Arkshine Date: Sat, 21 Mar 2015 15:29:55 +0100 Subject: [PATCH] Fix compiler output --- compiler/libpc300/libpc300.vcxproj | 253 ++++++++++----------- compiler/libpc300/libpc300.vcxproj.filters | 183 ++++++++------- compiler/libpc300/sc5.c | 5 +- 3 files changed, 218 insertions(+), 223 deletions(-) diff --git a/compiler/libpc300/libpc300.vcxproj b/compiler/libpc300/libpc300.vcxproj index 84cac9f4..1ebc7c37 100644 --- a/compiler/libpc300/libpc300.vcxproj +++ b/compiler/libpc300/libpc300.vcxproj @@ -1,128 +1,127 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {19B72687-080B-437A-917A-12AEB0031635} - libpc300 - Win32Proj - - - - DynamicLibrary - MultiByte - v120_xp - - - DynamicLibrary - MultiByte - v120_xp - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - false - true - AllRules.ruleset - - - AllRules.ruleset - - - amxxpc32 - amxxpc32 - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=32;NO_MAIN;_CRT_SECURE_NO_DEPRECATE;HAVE_STDINT_H;%(PreprocessorDefinitions) - MultiThreaded - false - - - Level3 - ProgramDatabase - - - true - Windows - true - true - $(OutDir)libpc300.lib - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=32;NO_MAIN;_CRT_SECURE_NO_DEPRECATE;HAVE_STDINT_H;%(PreprocessorDefinitions) - true - StackFrameRuntimeCheck - MultiThreadedDebug - false - - - Level3 - EditAndContinue - - - true - $(OutDir)libpc300.pdb - Windows - $(OutDir)libpc300.lib - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {19B72687-080B-437A-917A-12AEB0031635} + libpc300 + Win32Proj + + + + DynamicLibrary + MultiByte + v120_xp + + + DynamicLibrary + MultiByte + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + false + true + AllRules.ruleset + + + AllRules.ruleset + + + amxxpc32 + amxxpc32 + + + + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=32;NO_MAIN;_CRT_SECURE_NO_DEPRECATE;HAVE_STDINT_H;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level3 + ProgramDatabase + + + true + Windows + true + true + $(OutDir)libpc300.lib + MachineX86 + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=32;NO_MAIN;_CRT_SECURE_NO_DEPRECATE;HAVE_STDINT_H;%(PreprocessorDefinitions) + true + StackFrameRuntimeCheck + MultiThreadedDebug + false + + + Level3 + EditAndContinue + + + true + $(OutDir)libpc300.pdb + Windows + $(OutDir)libpc300.lib + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/compiler/libpc300/libpc300.vcxproj.filters b/compiler/libpc300/libpc300.vcxproj.filters index 8d9c17a0..9aecb230 100644 --- a/compiler/libpc300/libpc300.vcxproj.filters +++ b/compiler/libpc300/libpc300.vcxproj.filters @@ -1,94 +1,91 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - - - Resource Files - - - Resource Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Resource Files + + + Resource Files + + \ No newline at end of file diff --git a/compiler/libpc300/sc5.c b/compiler/libpc300/sc5.c index f7071f8f..50519fa6 100755 --- a/compiler/libpc300/sc5.c +++ b/compiler/libpc300/sc5.c @@ -74,7 +74,6 @@ static int lastline,errorcount; static short lastfile; char *msg,*pre,*filename; va_list argptr; - char string[128]; int is_warning; is_warning = (number >= 200 && !sc_warnings_are_errors); @@ -130,7 +129,7 @@ static short lastfile; va_start(argptr,number); if (strlen(errfname)==0) { int start= (errstart==errline) ? -1 : errstart; - if (pc_error((int)number,string,filename,start,errline,argptr)) { + if (pc_error((int)number,msg,filename,start,errline,argptr)) { if (outf!=NULL) { pc_closeasm(outf,TRUE); outf=NULL; @@ -144,7 +143,7 @@ static short lastfile; fprintf(fp,"%s(%d -- %d) : %s %03d: ",filename,errstart,errline,pre,number); else fprintf(fp,"%s(%d) : %s %03d: ",filename,errline,pre,number); - vfprintf(fp,string,argptr); + vfprintf(fp,msg,argptr); fclose(fp); } /* if */ } /* if */