Changed: make it compile in pure static
This commit is contained in:
parent
446c75463c
commit
e7a860cd8f
3 changed files with 31 additions and 2 deletions
|
@ -140,9 +140,16 @@ __declspec(dllexport) ISoundDriver::TDriver NLSOUND_getDriverType()
|
|||
|
||||
#elif defined (NL_OS_UNIX)
|
||||
|
||||
#ifndef NL_STATIC
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
#ifdef NL_STATIC
|
||||
ISoundDriver* createISoundDriverInstanceOpenAl(ISoundDriver::IStringMapperProvider *stringMapper)
|
||||
#else
|
||||
ISoundDriver* NLSOUND_createISoundDriverInstance(ISoundDriver::IStringMapperProvider *stringMapper)
|
||||
#endif
|
||||
{
|
||||
return new CSoundDriverAL(stringMapper);
|
||||
}
|
||||
|
@ -151,7 +158,10 @@ uint32 NLSOUND_interfaceVersion ()
|
|||
{
|
||||
return ISoundDriver::InterfaceVersion;
|
||||
}
|
||||
|
||||
#ifndef NL_STATIC
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // NL_OS_UNIX
|
||||
|
||||
|
|
|
@ -31,9 +31,9 @@ LDFLAGS = $(WWWLDFLAGS) $(LUALDFLAGS) $(LD_FLAGS_CMN) \
|
|||
-lclient_sheets \
|
||||
-lseven_zip \
|
||||
-lgame_share \
|
||||
-lnel3d \
|
||||
-Wl,--start-group -lnel_drv_opengl -lnel3d -Wl,--end-group \
|
||||
-Wl,--start-group -lnel_drv_openal -lnelsnd -Wl,--end-group \
|
||||
-lnelpacs \
|
||||
-lnelsnd \
|
||||
-lnelligo \
|
||||
-lnelgeorges \
|
||||
-lnelnet \
|
||||
|
@ -45,7 +45,9 @@ LDFLAGS = $(WWWLDFLAGS) $(LUALDFLAGS) $(LD_FLAGS_CMN) \
|
|||
-lrt \
|
||||
-ldl \
|
||||
-lluabind \
|
||||
-lopenal \
|
||||
-lcurl \
|
||||
-lGL \
|
||||
-lX11
|
||||
|
||||
#############################################################################
|
||||
|
|
|
@ -26,6 +26,23 @@
|
|||
# endif
|
||||
#endif
|
||||
|
||||
// to get rid of you_must_not_use_assert___use_nl_assert___read_debug_h_file messages
|
||||
#include <cassert>
|
||||
#undef assert
|
||||
#define assert nlassert
|
||||
#include <luabind/luabind.hpp>
|
||||
#if LUABIND_MAX_ARITY == 10
|
||||
# define LUABIND_VERSION 07
|
||||
#elif LUABIND_MAX_ARITY == 5
|
||||
# define LUABIND_VERSION 06
|
||||
#else
|
||||
# pragma error("luabind version not recognized")
|
||||
#endif
|
||||
#if LUABIND_VERSION == 07
|
||||
# include <luabind/operator.hpp>
|
||||
#endif
|
||||
|
||||
|
||||
#include "lua_ihm.h"
|
||||
#include "reflect.h"
|
||||
#include "action_handler.h"
|
||||
|
|
Loading…
Reference in a new issue