Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support for Emscripten to the compiler.

Browse Source
This commit is contained in:
Asher Baker
2014-08-15 16:32:00 +00:00
parent 17683249fd
commit 46123d359f
6 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
compiler/amxxpc/amxxpc.cpp
View File

@ -28,40 +28,50 @@
#endif
#endif
static PRINTF pc_printf = NULL;
void ReadFileIntoPl(abl *pl, FILE *fp);
bool CompressPl(abl *pl);
void Pl2Bh(abl *pl, BinPlugin *bh);
void WriteBh(BinaryWriter *bw, BinPlugin *bh);
#if defined(EMSCRIPTEN)
extern "C" void Compile32(int argc, char **argv);
extern "C" int pc_printf(const char *message,...);
#else
static PRINTF pc_printf = NULL;
#endif
int main(int argc, char **argv)
{
struct abl pl32;
#if defined(__linux__)
#if defined(EMSCRIPTEN)
COMPILER sc32 = (COMPILER)Compile32;
//pc_printf = (PRINTF)pc_printf;
#else
# if defined(__linux__)
HINSTANCE lib = NULL;
if (FileExists("./amxxpc32.so"))
lib = dlmount("./amxxpc32.so");
else
lib = dlmount("amxxpc32.so");
#elif defined(__APPLE__)
# elif defined(__APPLE__)
HINSTANCE lib = dlmount("amxxpc32.dylib");
#else
# else
HINSTANCE lib = dlmount("amxxpc32.dll");
#endif
# endif
if (!lib)
{
#if defined(__linux__) || defined(__APPLE__)
# if defined(__linux__) || defined(__APPLE__)
printf("compiler failed to instantiate: %s\n", dlerror());
#else
# else
printf("compiler failed to instantiate: %d\n", GetLastError());
#endif
# endif
exit(0);
}
COMPILER sc32 = (COMPILER)dlsym(lib, "Compile32");
pc_printf = (PRINTF)dlsym(lib, "pc_printf");
#endif //EMSCRIPTEN
if (!sc32 || !pc_printf)
{
@ -73,8 +83,9 @@ int main(int argc, char **argv)
exit(0);
}
pc_printf("Welcome to the AMX Mod X %s Compiler.\n", SVN_VERSION);
pc_printf("Copyright (c) 1997-2013 ITB CompuPhase, AMX Mod X Team\n\n");
pc_printf("AMX Mod X Compiler %s\n", SVN_VERSION);
pc_printf("Copyright (c) 1997-2006 ITB CompuPhase\n");
pc_printf("Copyright (c) 2004-2013 AMX Mod X Team\n\n");
if (argc < 2)
{
@ -166,7 +177,9 @@ int main(int argc, char **argv)
fclose(fp);
unlink(file);
pc_printf("Error, failed to write binary\n");
#if !defined EMSCRIPTEN
dlclose(lib);
#endif
exit(0);
}
@ -176,7 +189,9 @@ int main(int argc, char **argv)
pc_printf("Done.\n");
#if !defined EMSCRIPTEN
dlclose(lib);
#endif
exit(0);
}

3
compiler/amxxpc/amxxpc.h
View File

@ -10,7 +10,10 @@
#ifndef _AMXXSC_INCLUDE_H
#define _AMXXSC_INCLUDE_H
#ifndef SVN_VERSION
#include <amxmodx_version.h>
#endif
#define MAGIC_HEADER2 0x414D5858
#define MAGIC_VERSION 0x0300

6
compiler/amxxpc/sclinux.h
View File

@ -31,7 +31,11 @@
* For Linux, we must overrule these settings with those defined in glibc.
*/
#if !defined __BYTE_ORDER
# include <stdlib.h>
# if defined EMSCRIPTEN
# include <endian.h>
# else
# include <stdlib.h>
# endif
# if defined __APPLE__
# include <sys/types.h>
# define __BYTE_ORDER BYTE_ORDER