OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Make it compile and work in GCC / Linux

Browse Source
This commit is contained in:
Michael Hansen
2014-04-12 20:40:43 -07:00
parent f0ed701d8f
commit b48963b904
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/CoreLib/hsThread_Unix.cpp
View File

@ -307,8 +307,8 @@ hsSemaphore::~hsSemaphore()
status = sem_close(fPSema); status = sem_close(fPSema);
} else { } else {
status = sem_destroy(fPSema); status = sem_destroy(fPSema);
delete fPSema;
} }
delete fPSema;
hsThrowIfOSErr(status); hsThrowIfOSErr(status);
#else #else
int status = ::pthread_cond_destroy(&fPCond); int status = ::pthread_cond_destroy(&fPCond);

2
Sources/Plasma/CoreLib/plFileSystem.cpp
View File

@ -394,7 +394,7 @@ std::vector<plFileName> plFileSystem::ListDir(const plFileName &path, const char
continue; continue;
} }
if (pattern && pattern[0] && fnmatch(pattern, de->d_name, 0)) if (pattern && pattern[0] && fnmatch(pattern, de->d_name, 0) == 0)
contents.push_back(dir_name); contents.push_back(dir_name);
else if (!pattern || !pattern[0]) else if (!pattern || !pattern[0])
contents.push_back(dir_name); contents.push_back(dir_name);

1
Sources/Tools/plLocalizationEditor/CMakeLists.txt
View File

@ -39,6 +39,7 @@ set(plLocalizationEditor_UIC_SOURCES
qt5_wrap_ui(plLocalizationEditor_UIC ${plLocalizationEditor_UIC_SOURCES}) qt5_wrap_ui(plLocalizationEditor_UIC ${plLocalizationEditor_UIC_SOURCES})
# For generated ui_*.h files # For generated ui_*.h files
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(plLocalizationEditor WIN32 ${plLocalizationEditor_HEADERS} add_executable(plLocalizationEditor WIN32 ${plLocalizationEditor_HEADERS}

8
Sources/Tools/plLocalizationEditor/plEditDlg.cpp
View File

@ -54,16 +54,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <functional> #include <functional>
#define ABOUT_TEXT R"(plLocalizationEditor
A basic editor for Plasma 21 localization resource files
Copyright (C) 2004 Cyan Worlds, Inc.)"
static void IAboutDialog(QWidget *parent) static void IAboutDialog(QWidget *parent)
{ {
QDialog dlg(parent); QDialog dlg(parent);
QLabel *image = new QLabel(&dlg); QLabel *image = new QLabel(&dlg);
image->setPixmap(QPixmap(":/icon1.ico")); image->setPixmap(QPixmap(":/icon1.ico"));
QLabel *text = new QLabel(QObject::tr(ABOUT_TEXT), &dlg); QLabel *text = new QLabel(QObject::tr(R"(plLocalizationEditor
A basic editor for Plasma 21 localization resource files
Copyright (C) 2004 Cyan Worlds, Inc.)"), &dlg);
QPushButton *ok = new QPushButton(QObject::tr("OK"), &dlg); QPushButton *ok = new QPushButton(QObject::tr("OK"), &dlg);
ok->setDefault(true); ok->setDefault(true);