mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-26 16:56:19 +00:00
Changed: make it compile in pure static
This commit is contained in:
parent
52fc5c2387
commit
5386672aa2
3 changed files with 31 additions and 2 deletions
|
@ -140,9 +140,16 @@ __declspec(dllexport) ISoundDriver::TDriver NLSOUND_getDriverType()
|
||||||
|
|
||||||
#elif defined (NL_OS_UNIX)
|
#elif defined (NL_OS_UNIX)
|
||||||
|
|
||||||
|
#ifndef NL_STATIC
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef NL_STATIC
|
||||||
|
ISoundDriver* createISoundDriverInstanceOpenAl(ISoundDriver::IStringMapperProvider *stringMapper)
|
||||||
|
#else
|
||||||
ISoundDriver* NLSOUND_createISoundDriverInstance(ISoundDriver::IStringMapperProvider *stringMapper)
|
ISoundDriver* NLSOUND_createISoundDriverInstance(ISoundDriver::IStringMapperProvider *stringMapper)
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
return new CSoundDriverAL(stringMapper);
|
return new CSoundDriverAL(stringMapper);
|
||||||
}
|
}
|
||||||
|
@ -151,7 +158,10 @@ uint32 NLSOUND_interfaceVersion ()
|
||||||
{
|
{
|
||||||
return ISoundDriver::InterfaceVersion;
|
return ISoundDriver::InterfaceVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef NL_STATIC
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // NL_OS_UNIX
|
#endif // NL_OS_UNIX
|
||||||
|
|
||||||
|
|
|
@ -31,9 +31,9 @@ LDFLAGS = $(WWWLDFLAGS) $(LUALDFLAGS) $(LD_FLAGS_CMN) \
|
||||||
-lclient_sheets \
|
-lclient_sheets \
|
||||||
-lseven_zip \
|
-lseven_zip \
|
||||||
-lgame_share \
|
-lgame_share \
|
||||||
-lnel3d \
|
-Wl,--start-group -lnel_drv_opengl -lnel3d -Wl,--end-group \
|
||||||
|
-Wl,--start-group -lnel_drv_openal -lnelsnd -Wl,--end-group \
|
||||||
-lnelpacs \
|
-lnelpacs \
|
||||||
-lnelsnd \
|
|
||||||
-lnelligo \
|
-lnelligo \
|
||||||
-lnelgeorges \
|
-lnelgeorges \
|
||||||
-lnelnet \
|
-lnelnet \
|
||||||
|
@ -45,7 +45,9 @@ LDFLAGS = $(WWWLDFLAGS) $(LUALDFLAGS) $(LD_FLAGS_CMN) \
|
||||||
-lrt \
|
-lrt \
|
||||||
-ldl \
|
-ldl \
|
||||||
-lluabind \
|
-lluabind \
|
||||||
|
-lopenal \
|
||||||
-lcurl \
|
-lcurl \
|
||||||
|
-lGL \
|
||||||
-lX11
|
-lX11
|
||||||
|
|
||||||
#############################################################################
|
#############################################################################
|
||||||
|
|
|
@ -26,6 +26,23 @@
|
||||||
# endif
|
# endif
|
||||||
#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 "lua_ihm.h"
|
||||||
#include "reflect.h"
|
#include "reflect.h"
|
||||||
#include "action_handler.h"
|
#include "action_handler.h"
|
||||||
|
|
Loading…
Reference in a new issue