kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add MojoAL, sync for HL 1.6

Browse Source
This commit is contained in:
Joshua Granick
2018-06-14 10:49:11 -07:00
parent 79aa467ca6
commit 80798d887e
5 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -58,3 +58,6 @@
[submodule "project/lib/mbedtls"]
path = project/lib/mbedtls
url = https://github.com/native-toolkit/mbedtls
[submodule "project/lib/mojoal"]
path = project/lib/mojoal
url = https://github.com/native-toolkit/mojoal

2
lime/tools/platforms/WindowsPlatform.hx
View File

@@ -200,7 +200,7 @@ class WindowsPlatform extends PlatformTarget {
if (noOutput) return;
FileHelper.copyFile (targetDirectory + "/obj/ApplicationMain" + (project.debug ? "-Debug" : "") + ".hl", PathHelper.combine (applicationDirectory, project.app.file + ".hl"));
FileHelper.copyFile (targetDirectory + "/obj/ApplicationMain.hl", PathHelper.combine (applicationDirectory, project.app.file + ".hl"));
} else if (targetType == "nodejs") {

18
project/Build.xml
View File

@@ -23,8 +23,11 @@
<!-- <set name="LIME_NEKO" value="1" if="linux" /> -->
<set name="LIME_OGG" value="1" />
<set name="LIME_OPENALSOFT" value="1" if="windows || linux || android" unless="static_link" />
<set name="LIME_MOJOAL" value="1" if="switch || static_link || mojoal" />
<unset name="LIME_OPENALSOFT" if="LIME_MOJOAL" />
<set name="LIME_OPENAL" value="1" if="mac || iphone || emscripten || tvos" />
<set name="LIME_OPENAL" value="1" if="LIME_OPENALSOFT" />
<set name="LIME_OPENAL" value="1" if="LIME_MOJOAL" />
<set name="LIME_OPENGL" value="1" />
<set name="LIME_PIXMAN" value="1" />
<set name="LIME_PNG" value="1" />
@@ -125,11 +128,16 @@
<section if="LIME_HASHLINK">
<!-- <compilerflag value="-DLIBHL_EXPORTS" /> -->
<compilerflag value="-DLIME_HASHLINK" />
</section>
<section unless="LIME_HASHLINK">
<compilerflag value="-DLIBHL_EXPORTS" />
</section>
<section if="LIME_JPEG">
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/jpeg/" />
@@ -169,10 +177,12 @@
<section if="LIME_OPENAL">
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/include/" unless="emscripten" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/include/" unless="LIME_MOJOAL || emscripten" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mojoal/" if="LIME_MOJOAL" />
<compilerflag value="-DLIME_OPENAL" />
<compilerflag value="-DLIME_OPENALSOFT" if="LIME_OPENALSOFT" />
<compilerflag value="-DAL_LIBTYPE_STATIC=1" if="LIME_OPENALSOFT" />
<compilerflag value="-DLIME_MOJOAL" if="LIME_MOJOAL" />
<compilerflag value="-DAL_LIBTYPE_STATIC=1" if="LIME_OPENALSOFT || LIME_MOJOAL" />
<compilerflag value="-DAL_ALEXT_PROTOTYPES" if="LIME_OPENALSOFT" />
<file name="src/media/openal/OpenALBindings.cpp" />
@@ -325,6 +335,7 @@
<include name="lib/jpeg/files.xml" />
<include name="lib/lzma/files.xml" />
<include name="lib/mbedtls/files.xml" />
<include name="lib/mojoal/files.xml" />
<include name="lib/neko/files.xml" />
<include name="lib/ogg/files.xml" />
<include name="lib/openal/files.xml" />
@@ -357,6 +368,7 @@
<files id="native-toolkit-jpeg" if="LIME_JPEG" />
<files id="native-toolkit-lzma" if="LIME_LZMA" />
<files id="native-toolkit-mbedtls" if="LIME_MBEDTLS" />
<files id="native-toolkit-mojoal" if="LIME_MOJOAL" />
<files id="native-toolkit-neko" if="LIME_NEKO" />
<files id="native-toolkit-ogg" if="LIME_OGG" />
<files id="native-toolkit-openal" if="LIME_OPENALSOFT" />

13
project/include/hl.h
View File

@@ -643,13 +643,13 @@ HL_API void hl_thread_yield(void);
HL_API void hl_register_thread( void *stack_top );
HL_API void hl_unregister_thread( void );
HL_API hl_mutex *hl_mutex_alloc( void );
HL_API hl_mutex *hl_mutex_alloc( bool gc_thread );
HL_API void hl_mutex_acquire( hl_mutex *l );
HL_API bool hl_mutex_try_acquire( hl_mutex *l );
HL_API void hl_mutex_release( hl_mutex *l );
HL_API void hl_mutex_free( hl_mutex *l );
HL_API hl_tls *hl_tls_alloc( void );
HL_API hl_tls *hl_tls_alloc( bool gc_value );
HL_API void hl_tls_set( hl_tls *l, void *value );
HL_API void *hl_tls_get( hl_tls *l );
HL_API void hl_tls_free( hl_tls *l );
@@ -773,6 +773,12 @@ typedef struct {
# define DEFINE_PRIM_WITH_NAME _DEFINE_PRIM_WITH_NAME
#endif
#if defined(HL_GCC) && !defined(HL_CONSOLE)
# define HL_NO_OPT __attribute__((optimize("-O0")))
#else
# define HL_NO_OPT
#endif
// -------------- EXTRA ------------------------------------
#define hl_fatal(msg) hl_fatal_error(msg,__FILE__,__LINE__)
@@ -798,6 +804,7 @@ struct _hl_trap_ctx {
#define HL_EXC_RETHROW 1
#define HL_EXC_CATCH_ALL 2
#define HL_EXC_IS_THROW 4
#define HL_TRACK_DISABLE 8
typedef struct {
int thread_id;
@@ -821,4 +828,4 @@ HL_API hl_thread_info *hl_get_thread();
C_FUNCTION_END
#endif
#endif

1
project/lib/mojoal Submodule

Submodule project/lib/mojoal added at 264b524ea5