townforge/tb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hastybadger' of github.com:tesch1/turbobadger into hastybadger

Browse Source
This commit is contained in:
Michael Tesch 2019-11-13 12:58:48 +01:00
commit dad6f07f9a
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -365,8 +365,8 @@ if (NOT TB_SUBDIRECTORY)
if (ETAGS)
add_custom_target (tags
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND etags --language=c++ ${CMAKE_CURRENT_SOURCE_DIR}/Demo/*.[ch]*
COMMAND etags --language=c++ --append `find ${CMAKE_CURRENT_SOURCE_DIR} -name '*.[ch]*'`
COMMAND etags --language=c++ Demo/*/*.[ch]*
COMMAND etags --language=c++ --append `find . -name '*.[ch]*'`
)
add_custom_target (etags DEPENDS tags)
endif (ETAGS)

16
src/tb/tb_file_posix.cpp
View File

@ -60,23 +60,13 @@ private:
TBFile *TBFile::Open(const TBStr & filename, TBFileMode mode)
{
FILE *f = nullptr;
TBStr pathfile;
if (filename[0] != '/')
{
#ifdef TB_FILE_POSIX_PREFIX
pathfile.Set(TB_FILE_POSIX_PREFIX);
#endif
pathfile.Append(filename);
}
else
pathfile.Set(filename);
switch (mode)
{
case MODE_READ:
f = fopen(pathfile.CStr(), "rb");
f = fopen(filename.CStr(), "rb");
break;
case MODE_WRITETRUNC:
f = fopen(pathfile.CStr(), "w");
f = fopen(filename.CStr(), "w");
break;
default:
break;
@ -85,7 +75,7 @@ TBFile *TBFile::Open(const TBStr & filename, TBFileMode mode)
if (!f) {
char tmp[256];
TBDebugPrint("Cwd: '%s'\n", getcwd(tmp, sizeof(tmp)));
TBDebugPrint("TBFile::Open, unable to open file '%s'\n", pathfile.CStr());
TBDebugPrint("TBFile::Open, unable to open file '%s'\n", filename.CStr());
}
#endif
if (!f)

2
src/tb/tests/tb_test.cpp
View File

@ -44,6 +44,7 @@ TBTestGroup *g_test_groups = nullptr;
TBStr tb_get_test_file_name(const char *testpath, const char *filename)
{
TBStr str;
#if 0
#ifndef __EMSCRIPTEN__
int test_path_len = strlen(testpath);
for (int i = test_path_len - 1; i > 0 && testpath[i] != '/' && testpath[i] != '\\'; i--)
@ -51,6 +52,7 @@ TBStr tb_get_test_file_name(const char *testpath, const char *filename)
str.Set(TBStr(testpath, test_path_len));
#else
str.Append("/");
#endif
#endif
str.Append(filename);
return str;