6502
/
l65
mirror of https://github.com/g012/l65.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed linux x86_64 compilation.

This commit is contained in:
g012 2017-09-28 12:06:33 +02:00
parent 42826585df
commit 23b3135ae7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -62,9 +62,8 @@ else ()
add_definitions(-D_FILE_OFFSET_BITS=64)
add_compile_options(-fno-strict-aliasing -fomit-frame-pointer -ffast-math -fvisibility=hidden -fno-threadsafe-statics -fvisibility-inlines-hidden)
add_compile_options(-fno-rtti -fno-exceptions)
add_compile_options(-Werror -Wsign-compare -Wno-dangling-else -Wno-missing-braces -Wno-unused-function -Wno-shift-op-parentheses -Wno-unused-variable -Wno-switch -Wno-parentheses)
add_compile_options(-fno-strict-aliasing -fomit-frame-pointer -ffast-math -fvisibility=hidden)
add_compile_options(-Wsign-compare -Wno-missing-braces -Wno-unused-function -Wno-unused-variable -Wno-switch -Wno-parentheses)
endif()
@ -93,6 +92,7 @@ set(L65_SCRIPTS
)
add_executable(embed ${L65_SOURCE_DIR}/embed.c)
set_property(TARGET embed PROPERTY C_STANDARD 99)
add_custom_command(
OUTPUT ${L65_BINARY_DIR}/scripts.h
COMMAND embed -o ${L65_BINARY_DIR}/scripts.h ${L65_SCRIPTS}
@ -101,7 +101,6 @@ add_custom_command(
add_custom_target(prereq DEPENDS ${L65_BINARY_DIR}/scripts.h)
add_executable(${PROJECT_NAME} ${L65_SOURCES} ${L65_HEADERS} ${L65_RESOURCES})
add_dependencies(${PROJECT_NAME} prereq)
set_property(TARGET ${PROJECT_NAME} PROPERTY C_STANDARD 99)
target_include_directories(${PROJECT_NAME} PRIVATE "${L65_SOURCE_DIR}" "${L65_BINARY_DIR}")
@ -115,4 +114,5 @@ elseif (UNIX)
endif()
target_link_libraries(embed ${LINKLIBS})
target_link_libraries(${PROJECT_NAME} ${LINKLIBS})

2
embed.c
View File

@ -116,7 +116,7 @@ static int pmain(lua_State* L)
int size = (int)ftell(l);
rewind(l);
unsigned char *buffer = malloc(size);
if (size != fread(buffer, 1, size, l)) fatal("failed reading input file");
if (size != (int)fread(buffer, 1, size, l)) fatal("failed reading input file");
fclose(l);
fprintf(f, "static const char %s[] = {", name);
for (int i = 0; i < size; ++i)

2
lpeg.c
View File

@ -283,7 +283,7 @@ typedef struct Pattern {
/* number of children for each tree */
extern const byte numsiblings[];
static const byte numsiblings[];
/* access to children */
#define sib1(t) ((t) + 1)