generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://github.com/ChaiScript/ChaiScript into develop

Browse Source
This commit is contained in:
Jason Turner
2014-05-23 09:57:29 -06:00
parent 46e7d0ab99 d5378f50af
commit e5d723621f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/chaiscript/chaiscript_defines.hpp
View File

@@ -12,7 +12,7 @@
#define CHAISCRIPT_HAS_DECLSPEC
#endif
#ifdef _WIN32
#if defined(_WIN32) || defined(__CYGWIN__)
#define CHAISCRIPT_WINDOWS
#endif

8
include/chaiscript/language/chaiscript_engine.hpp
View File

@@ -34,7 +34,7 @@
#include <unistd.h>
#endif
#ifdef _POSIX_VERSION
#if defined(_POSIX_VERSION) && !defined(__CYGWIN__)
#include <dlfcn.h>
#else
#ifdef CHAISCRIPT_WINDOWS
@@ -69,7 +69,7 @@ namespace chaiscript
namespace detail
{
#ifdef _POSIX_VERSION
#if defined(_POSIX_VERSION) && !defined(__CYGWIN__)
struct Loadable_Module
{
struct DLModule
@@ -438,8 +438,7 @@ namespace chaiscript
m_usepaths.push_back("");
}
#ifdef _POSIX_VERSION
#if defined(_POSIX_VERSION) && !defined(__CYGWIN__)
// If on Unix, add the path of the current executable to the module search path
// as windows would do
@@ -704,6 +703,7 @@ namespace chaiscript
std::vector<std::string> prefixes;
prefixes.push_back("lib");
prefixes.push_back("cyg");
prefixes.push_back("");
std::vector<std::string> postfixes;