From aa48c82469cfe81f9fb6bf9aaccc3795a2e7bbf2 Mon Sep 17 00:00:00 2001 From: "Matt Raykowski\"" Date: Fri, 24 Sep 2010 10:36:14 -0500 Subject: [PATCH 1/2] Changed: WITH_TESTS has been changed to WITH_NEL_TESTS, CI unit testing should work now. --- code/nel/tools/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/nel/tools/CMakeLists.txt b/code/nel/tools/CMakeLists.txt index 932371b28..9aa869d60 100644 --- a/code/nel/tools/CMakeLists.txt +++ b/code/nel/tools/CMakeLists.txt @@ -21,8 +21,8 @@ IF(WITH_SOUND) ADD_SUBDIRECTORY(sound) ENDIF(WITH_SOUND) -IF(WITH_TESTS) +IF(WITH_NEL_TESTS) ADD_SUBDIRECTORY(nel_unit_test) -ENDIF(WITH_TESTS) +ENDIF(WITH_NEL_TESTS) #build_gamedata From 51b1d78457508e8ecf954ffac800d0956c331646 Mon Sep 17 00:00:00 2001 From: "Matt Raykowski\"" Date: Fri, 24 Sep 2010 10:36:54 -0500 Subject: [PATCH 2/2] Fixed: C++-style comments in PIC C code, eliminates errors on recent gcc compilers for tile editor. --- .../tools/3d/tile_edit_qt/pic/PIC_System.c | 24 ++++++++-------- .../tools/3d/tile_edit_qt/pic/Pic_Manage.c | 6 ++-- code/nel/tools/3d/tile_edit_qt/pic/Pic_TGA.c | 6 ++-- .../tools/3d/tile_edit_qt/pic/pic_private.h | 28 +++++++++---------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/code/nel/tools/3d/tile_edit_qt/pic/PIC_System.c b/code/nel/tools/3d/tile_edit_qt/pic/PIC_System.c index 4ef946b2f..f47bc7064 100644 --- a/code/nel/tools/3d/tile_edit_qt/pic/PIC_System.c +++ b/code/nel/tools/3d/tile_edit_qt/pic/PIC_System.c @@ -13,7 +13,7 @@ static unsigned long PIC_Sys_MEM_NbAllocs; #define _msize malloc_usable_size #endif /* __GNUC__ */ -// ---------------------------------------------------------------------------------------------------------------------------------- +/* ---------------------------------------------------------------------------------------------------------------------------------- */ void *Pic_malloc(unsigned long size) { @@ -26,7 +26,7 @@ void *Pic_malloc(unsigned long size) } return(mem); } -// ----- +/* ----- */ void *Pic_calloc(unsigned long count, unsigned long size) { void *mem; @@ -38,7 +38,7 @@ void *Pic_calloc(unsigned long count, unsigned long size) } return(mem); } -// ----- +/* ----- */ void Pic_free(void *memblock) { unsigned long size; @@ -47,23 +47,23 @@ void Pic_free(void *memblock) PIC_Sys_MEM_NbAllocs--; free(memblock); } -// ----- +/* ----- */ unsigned long Pic__msize(void *memblock) { return(_msize(memblock)); } -// ----- +/* ----- */ unsigned long PIC_GetMemNbAllocs(void) { return(PIC_Sys_MEM_NbAllocs); } -// ----- +/* ----- */ unsigned long PIC_GetMemAllocated(void) { return(PIC_Sys_MEM_Allocated); } -// ---------------------------------------------------------------------------------------------------------------------------------- +/* ---------------------------------------------------------------------------------------------------------------------------------- */ static unsigned char PIC_ErrorFlag; static unsigned char PIC_ErrorString[PIC_ERRSIZE]; @@ -95,23 +95,23 @@ void Pic_SetError(unsigned char *msg, ...) if (PIC_Sys_FnctActive) PIC_Sys_Fnct(); return; } -// ----- +/* ----- */ char* PIC_GetError(void) { return(PIC_ErrorString); } -// ----- +/* ----- */ unsigned char PIC_Error(void) { return(PIC_ErrorFlag); } -// ----- +/* ----- */ void PIC_ResetError(void) { strcpy(PIC_ErrorString,""); PIC_ErrorFlag=0; } -// ----- +/* ----- */ unsigned char PIC_OnErrorCall( void pFnct(void) ) { if (pFnct != NULL) @@ -126,5 +126,5 @@ unsigned char PIC_OnErrorCall( void pFnct(void) ) return(1); } -// ---------------------------------------------------------------------------------------------------------------------------------- +/* ---------------------------------------------------------------------------------------------------------------------------------- */ diff --git a/code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c b/code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c index a972cccce..4765809ff 100644 --- a/code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c +++ b/code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c @@ -595,7 +595,7 @@ unsigned long PIC_Save(unsigned long id, char* FileName, unsigned long type, uns err=1; } break; - // --- + /* --- */ default: Pic_SetError("Save %s, unknow save format/type",FileName); err=1; @@ -608,7 +608,7 @@ unsigned long PIC_Save(unsigned long id, char* FileName, unsigned long type, uns return(err-1); } -// ---------------------------------------------------------------------------------------------------------------------------------- +/* ---------------------------------------------------------------------------------------------------------------------------------- */ unsigned long PIC_Destroy(unsigned long id) { @@ -651,4 +651,4 @@ unsigned long PIC_Destroy(unsigned long id) return(1); } -// ---------------------------------------------------------------------------------------------------------------------------------- \ No newline at end of file +/* ---------------------------------------------------------------------------------------------------------------------------------- */ diff --git a/code/nel/tools/3d/tile_edit_qt/pic/Pic_TGA.c b/code/nel/tools/3d/tile_edit_qt/pic/Pic_TGA.c index 441b1eaa9..5f598d4eb 100644 --- a/code/nel/tools/3d/tile_edit_qt/pic/Pic_TGA.c +++ b/code/nel/tools/3d/tile_edit_qt/pic/Pic_TGA.c @@ -5,7 +5,7 @@ #include "pic_private.h" #include "pic.h" -// ---------------------------------------------------------------------------------------------------------------------------------- +/* ---------------------------------------------------------------------------------------------------------------------------------- */ #pragma pack(1) typedef struct TGA_HEADER @@ -25,7 +25,7 @@ typedef struct TGA_HEADER } TGA_HEADER; #pragma pack() -// ---------------------------------------------------------------------------------------------------------------------------------- +/* ---------------------------------------------------------------------------------------------------------------------------------- */ unsigned long Pic_TGA_Read( unsigned char *FileName, unsigned char **ppPal, unsigned char **ppDatas, @@ -138,7 +138,7 @@ unsigned long Pic_TGA_Read( unsigned char *FileName, } -// ---------------------------------------------------------------------------------------------------------------------------------- +/* ---------------------------------------------------------------------------------------------------------------------------------- */ unsigned long Pic_TGA_Write( unsigned char *FileName, unsigned char *pPal,unsigned char *pDatas, diff --git a/code/nel/tools/3d/tile_edit_qt/pic/pic_private.h b/code/nel/tools/3d/tile_edit_qt/pic/pic_private.h index 1239f5af9..164b2067d 100644 --- a/code/nel/tools/3d/tile_edit_qt/pic/pic_private.h +++ b/code/nel/tools/3d/tile_edit_qt/pic/pic_private.h @@ -17,12 +17,12 @@ typedef struct PIC_PICTURE struct PIC_PICTURE *Next; } PIC_PICTURE; -// ---------------------------------------------------------------------------------------------------------------------------------- +/* ---------------------------------------------------------------------------------------------------------------------------------- */ -// -// JPG -// +/* + * JPG +*/ extern unsigned long Pic_JPG_Read( unsigned char *FileName, @@ -33,9 +33,9 @@ extern unsigned long Pic_JPG_Write( unsigned char *FileName, unsigned long Qual, unsigned char *pDatas, unsigned long w, unsigned long h); -// -// TGA -// +/* + * TGA +*/ extern unsigned long Pic_TGA_Read( unsigned char *FileName, unsigned char **ppPal, unsigned char **ppDatas, unsigned long *pWidth, unsigned long *pHeight, @@ -43,9 +43,9 @@ extern unsigned long Pic_TGA_Read( unsigned char *FileName, extern unsigned long Pic_TGA_Write( unsigned char *FileName, unsigned char *pPal,unsigned char *pDatas, unsigned long w, unsigned long h, unsigned long d); -// -// BMP -// +/* + * BMP +*/ extern unsigned long Pic_BMP_Read( unsigned char *FileName, unsigned char **ppPal, unsigned char **ppDatas, unsigned long *pWidth, unsigned long *pHeight, @@ -54,16 +54,16 @@ extern unsigned long Pic_BMP_Read( unsigned char *FileName, extern unsigned long Pic_BMP_Write( unsigned char *FileName, unsigned char *pPal,unsigned char *pDatas, unsigned long w, unsigned long h, unsigned long d); -// -// System -// +/* + * System +*/ extern void* Pic_malloc(unsigned long size); extern void* Pic_calloc(unsigned long count, unsigned long size); extern void Pic_free(void *memblock); extern unsigned long Pic__msize(void *memblock); extern void Pic_SetError(unsigned char *msg, ...); -// ---------------------------------------------------------------------------------------------------------------------------------- +/* ---------------------------------------------------------------------------------------------------------------------------------- */ #ifdef __cplusplus }