reHLDS/metamod-r
2
0
Fork 0
mirror of https://github.com/rehlds/metamod-r.git synced 2025-01-14 07:38:16 +03:00
Code Issues Projects Releases Wiki Activity

Fixed compilation

Browse Source
This commit is contained in:
s1lentq 2017-01-18 03:51:43 +07:00
parent 274e7cef8e
commit f2b842b795
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
metamod/build.gradle
View File

@ -47,6 +47,8 @@ void setupToolchain(NativeBinarySpec b)
pchHeader: 'precompiled.h', pchHeader: 'precompiled.h',
pchSourceSet: 'rmod_pch' pchSourceSet: 'rmod_pch'
) )
cfg.extraLibs 'psapi.lib'
cfg.singleDefines('_CRT_SECURE_NO_WARNINGS') cfg.singleDefines('_CRT_SECURE_NO_WARNINGS')
} else if (cfg instanceof GccToolchainConfig) { } else if (cfg instanceof GccToolchainConfig) {
cfg.compilerOptions.pchConfig = new GccToolchainConfig.PrecompilerHeaderOptions( cfg.compilerOptions.pchConfig = new GccToolchainConfig.PrecompilerHeaderOptions(
@ -99,7 +101,7 @@ model {
components { components {
metamod(NativeLibrarySpec) { metamod(NativeLibrarySpec) {
targetPlatform 'x86' targetPlatform 'x86'
baseName GradleCppUtils.windows ? 'metamod_mm' : 'metamod_mm_i386' baseName GradleCppUtils.windows ? 'metamod' : 'metamod_i386'
sources { sources {
rmod_pch(CppSourceSet) { rmod_pch(CppSourceSet) {

6
metamod/src/mplugin.cpp
View File

@ -421,8 +421,8 @@ char *MPlugin::resolve_suffix(char *path) const
} }
#ifndef _WIN32 #ifndef _WIN32
for (size_t i = 0; i < arraysize(g_platform_suffixes); i++) { for (size_t i = 0; i < arraysize(g_platform_postfixes); i++) {
Q_snprintf(tmpbuf, sizeof tmpbuf, "%s%s", path, g_platform_suffixes[i]); Q_snprintf(tmpbuf, sizeof tmpbuf, "%s%s", path, g_platform_postfixes[i]);
if ((found = check(tmpbuf))) return found; if ((found = check(tmpbuf))) return found;
} }
#endif #endif
@ -1393,7 +1393,7 @@ const char *MPlugin::str_source(STR_SOURCE fmt) const
else else
{ {
if (fmt == SO_SHOW) return UTIL_VarArgs("pl%d", m_source_plugin_index); if (fmt == SO_SHOW) return UTIL_VarArgs("pl%d", m_source_plugin_index);
else return UTIL_VarArgs("plugin [%s]", g_plugins.find(m_source_plugin_index)->m_desc); else return UTIL_VarArgs("plugin [%s]", g_plugins->find(m_source_plugin_index)->m_desc);
} }
default: default:
if (fmt == SO_SHOW) return UTIL_VarArgs("UNK%d", m_source); if (fmt == SO_SHOW) return UTIL_VarArgs("UNK%d", m_source);

2
metamod/src/osdep.cpp
View File

@ -120,7 +120,7 @@ const char* CSysModule::getloaderror()
#ifdef _WIN32 #ifdef _WIN32
return str_GetLastError(); return str_GetLastError();
#else #else
return dlerror; return dlerror();
#endif #endif
} }

2
metamod/src/utils.cpp
View File

@ -141,6 +141,7 @@ bool is_absolute_path(const char *path)
return false; return false;
} }
#ifdef _WIN32
char *realpath(const char *file_name, char *resolved_name) char *realpath(const char *file_name, char *resolved_name)
{ {
int ret = GetFullPathName(file_name, PATH_MAX, resolved_name, NULL); int ret = GetFullPathName(file_name, PATH_MAX, resolved_name, NULL);
@ -166,3 +167,4 @@ char *realpath(const char *file_name, char *resolved_name)
return NULL; return NULL;
} }
#endif // _WIN32

4
metamod/src/utils.h
View File

@ -50,9 +50,9 @@ const char* LOCALINFO(char* key);
#ifdef _WIN32 #ifdef _WIN32
char *mm_strtok_r(char *s, const char *delim, char **ptrptr); char *mm_strtok_r(char *s, const char *delim, char **ptrptr);
#endif char *realpath(const char *file_name, char *resolved_name);
#endif // _WIN32
char* trimbuf(char *str); char* trimbuf(char *str);
void normalize_pathname(char *path); void normalize_pathname(char *path);
bool is_absolute_path(const char *path); bool is_absolute_path(const char *path);
char *realpath(const char *file_name, char *resolved_name);

6
publish.gradle
View File

@ -21,9 +21,9 @@ task publishPrepareFiles << {
pubRootDir.mkdirs() pubRootDir.mkdirs()
project.file('publish/publishRoot/metamod/addons/metamod').mkdirs() project.file('publish/publishRoot/metamod/addons/metamod').mkdirs()
_copyFileToDir('publish/metamod_mm.dll', 'publish/publishRoot/metamod/addons/metamod/') _copyFileToDir('publish/metamod.dll', 'publish/publishRoot/metamod/addons/metamod/')
//_copyFileToDir('publish/metamod_mm.pdb', 'publish/publishRoot/metamod/addons/metamod/') //_copyFileToDir('publish/metamod.pdb', 'publish/publishRoot/metamod/addons/metamod/')
_copyFile('publish/libmetamod_mm_i386.so', 'publish/publishRoot/metamod/addons/metamod/metamod_mm_i386.so') _copyFile('publish/libmetamod_i386.so', 'publish/publishRoot/metamod/addons/metamod/metamod_i386.so')
} }
task publishPackage(type: Zip, dependsOn: 'publishPrepareFiles') { task publishPackage(type: Zip, dependsOn: 'publishPrepareFiles') {