Skip to content

Commit dcfb7dc

Browse files
committed
Compilation fix for Windows
1 parent 6d0bc5f commit dcfb7dc

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

Libraries/CMakeLists.txt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,21 +267,24 @@ include(ExternalProject)
267267
find_program(MAKE_EXECUTABLE NAMES gmake make REQUIRED)
268268

269269
if(WIN32)
270-
set(LUAJIT_LIB_NAME libluajit-5.1.dll.a)
271-
set(LUAJIT_MAKE_ARGS SHELL=cmd)
270+
set(LUAJIT_LIB_NAME luajit.lib)
271+
set(LUAJIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/pd-lua/luas/luajit/src)
272+
set(LUAJIT_BUILD_COMMAND cmd /c msvcbuild.bat static)
272273
elseif(APPLE)
273274
set(LUAJIT_LIB_NAME libluajit.a)
274-
set(LUAJIT_MAKE_ARGS MACOSX_DEPLOYMENT_TARGET=10.11)
275+
set(LUAJIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/pd-lua/luas/luajit/)
276+
set(LUAJIT_BUILD_COMMAND ${MAKE_EXECUTABLE} -C src MACOSX_DEPLOYMENT_TARGET=10.11 BUILDMODE=static)
275277
else()
276278
set(LUAJIT_LIB_NAME libluajit.a)
277-
set(LUAJIT_MAKE_ARGS CFLAGS=-fPIC)
279+
set(LUAJIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/pd-lua/luas/luajit/)
280+
set(LUAJIT_BUILD_COMMAND ${MAKE_EXECUTABLE} -C src CFLAGS=-fPIC BUILDMODE=static)
278281
endif()
279282

280283
ExternalProject_Add(luajit_build
281-
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/pd-lua/luas/luajit
284+
SOURCE_DIR ${LUAJIT_SOURCE_DIR}
282285
BUILD_IN_SOURCE TRUE
283286
CONFIGURE_COMMAND ""
284-
BUILD_COMMAND ${MAKE_EXECUTABLE} -C src ${LUAJIT_MAKE_ARGS}
287+
BUILD_COMMAND ${LUAJIT_BUILD_COMMAND}
285288
INSTALL_COMMAND ""
286289
BUILD_BYPRODUCTS ${CMAKE_CURRENT_SOURCE_DIR}/pd-lua/luas/luajit/src/${LUAJIT_LIB_NAME}
287290
)

0 commit comments

Comments
 (0)