fix build issues.

3 files changed, 8 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91ff57f..442f226 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,14 +28,13 @@ enable_language( CXX )
 include_directories( src ${LUA_INCLUDE_DIR} )
 add_definitions( -std=c++17 -O3 -fPIC )
 
-add_library( moonp MODULE src/MoonP/ast.cpp src/MoonP/parser.cpp src/MoonP/moon_parser.cpp src/MoonP/moon_compiler.cpp src/MoonP/moonplus.cpp)
-set_target_properties( moonp PROPERTIES PREFIX "")
-target_link_libraries( moonp ${LUA_LIBRARIES} )
+add_library( libmoonp MODULE src/MoonP/ast.cpp src/MoonP/parser.cpp src/MoonP/moon_parser.cpp src/MoonP/moon_compiler.cpp src/MoonP/moonplus.cpp)
+set_target_properties( libmoonp PROPERTIES PREFIX "" )
+set_target_properties( libmoonp PROPERTIES OUTPUT_NAME "moonp" )
+target_link_libraries( libmoonp ${LUA_LIBRARIES} )
 
-add_custom_command(TARGET moonp
-        POST_BUILD
-        COMMAND make release
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+add_executable( moonp src/MoonP/ast.cpp src/MoonP/moon_compiler.cpp src/MoonP/moon_parser.cpp src/MoonP/moonplus.cpp src/MoonP/parser.cpp src/moonp.cpp )
+target_link_libraries( moonp ${LUA_LIBRARIES} )
 
 install(CODE "")
 
diff --git a/moonplus-dev-1.rockspec b/moonplus-dev-1.rockspec
index 251fcf2..40db89b 100644
--- a/moonplus-dev-1.rockspec
+++ b/moonplus-dev-1.rockspec
@@ -27,7 +27,7 @@ build = {
                         "build.luarocks/moonp.so"
                 },
                 bin = {
-                        "bin/release/moonp"
+                        "build.luarocks/moonp"
                 }
         }
 }
diff --git a/src/lua/makefile b/src/lua/makefile
index bf09f24..8e11fa3 100644
--- a/src/lua/makefile
+++ b/src/lua/makefile
@@ -53,7 +53,7 @@ MYCFLAGS= $(LOCAL) -std=c99
 
 UNAME_S:=$(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
-        MYCFLAGS += -DLUA_USE_MACOS
+        MYCFLAGS += -DLUA_USE_MACOSX
         MYLDFLAGS= $(LOCAL) -Wl
 else
         MYCFLAGS += -DLUA_USE_LINUX