Skip to content

Commit

Permalink
Merge pull request #81 from toppers/add-build-m32
Browse files Browse the repository at this point in the history
Update build m32 option for posix
  • Loading branch information
mitsut authored Nov 24, 2024
2 parents c36baaf + 7da12e3 commit 739d208
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ message(STATUS "CMAKE_OSX_ARCHITECTURES: ${CMAKE_OSX_ARCHITECTURES}")
message(STATUS "BUILD_TYPE" ${BUILD_TYPE})
message(STATUS "GCOV" ${GCOV})

message(STATUS "CMAKE_C_FLAGS" ${CMAKE_C_FLAGS})
message(STATUS "CMAKE_CXX_FLAGS" ${CMAKE_CXX_FLAGS})
#add_subdirectory(src/cmd)
#add_subdirectory(src/lib)
add_subdirectory(core)
Expand All @@ -48,8 +50,10 @@ endif(WIN32)
add_subdirectory(src/hakoc)
add_subdirectory(src/assets)
add_subdirectory(src/conductor)
if(NOT "${CMAKE_CXX_FLAGS}" MATCHES "-m32")
add_subdirectory(bindings)
add_subdirectory(examples)
endif()

#if (test)
# add_subdirectory(test)
Expand Down
5 changes: 4 additions & 1 deletion build.bash
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ else
ENABLE_HAKO_TIME_MEASURE_FLAG=""
fi

# C_FLAGS と CXX_FLAGS に -m32 オプションを追加
# BUILD_C_FLAGS="-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32"

DEFAULT_HAKO_ASSET_NUM=4
if [ ! -z "${ASSET_NUM}" ] && [ ${ASSET_NUM} -gt ${DEFAULT_HAKO_ASSET_NUM} ]; then
:
Expand All @@ -30,7 +33,7 @@ then
cd cmake-build
if [ ${OS_TYPE} = "posix" ]
then
cmake .. $ENABLE_HAKO_TIME_MEASURE_FLAG -DHAKO_DATA_MAX_ASSET_NUM=${ASSET_NUM}
cmake .. $ENABLE_HAKO_TIME_MEASURE_FLAG -DHAKO_DATA_MAX_ASSET_NUM=${ASSET_NUM} $BUILD_C_FLAGS
make
else
cmake ..
Expand Down
1 change: 1 addition & 0 deletions install.bash
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ ${SUDO} cp -rp py ${INSTALL_DIR}/lib/hakoniwa/
if [ ${OS_TYPE} = "posix" ]
then
${SUDO} cp cmake-build/src/proxy/hako-proxy /usr/local/bin/hakoniwa/
# Comment out if Python installation is not needed
bash bindings/python/install.bash
fi

Expand Down

0 comments on commit 739d208

Please sign in to comment.