diff --git a/.gitignore b/.gitignore index aa29d58..d2abba4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,18 @@ -# Prerequisites -*.d +# Keep empty directories: +# Keep empty directories: >> .gitignore/.git* -# Object files -*.o -*.ko -*.obj -*.elf - -# Linker output -*.ilk -*.map -*.exp - -# Precompiled Headers -*.gch -*.pch - -# Libraries +# Compiled Static libraries *.lib *.a *.la +*.lai *.lo -# Shared objects (inc. Windows DLLs) -*.dll +# Compiled Dynamic libraries *.so *.so.* *.dylib +*.dll # Executables *.exe @@ -36,18 +22,24 @@ *.x86_64 *.hex -# Debug files -*.dSYM/ -*.su -*.idb -*.pdb +*.dgcov +.*.swp +.gdb_history -# Kernel Module Compile Results -*.mod* -*.cmd -.tmp_versions/ -modules.order -Module.symvers -Mkfile.old -dkms.conf -client.cnf \ No newline at end of file +#VS files/directories +*.vcxproj +*.filters +*.user +ipch +*.sln +*.suo +*.sdf +Win32 +x64 +*.dir +Debug +Release +RelWithDebInfo + +#vim backups +*.*~ diff --git a/mariadb_posix.py b/mariadb_posix.py index 92db71e..c489afc 100644 --- a/mariadb_posix.py +++ b/mariadb_posix.py @@ -54,6 +54,7 @@ def get_config(options): cfg = MariaDBConfiguration() cfg.version = cc_version[0] + plugindir= mariadb_config(config_prg, "plugindir") libs = mariadb_config(config_prg, "libs") extra_libs= mariadb_config(config_prg, "libs_sys") cfg.lib_dirs = [dequote(i[2:]) for i in libs if i.startswith("-L")] @@ -67,4 +68,5 @@ def get_config(options): cfg.extra_objects = ['{}/lib{}.a'.format(cfg.lib_dirs[0], l) for l in ["mariadbclient"]] cfg.libs = [dequote(i[2:]) for i in extra_libs if i.startswith("-l")] cfg.includes = mariadb_includes + cfg.extra_compile_args= ["-DDEFAULT_PLUGINS_SUBDIR=\"%s\"" % plugindir[0]] return cfg