Permalink
Browse files

Building on Mac with cmake refactor now

  • Loading branch information...
1 parent d234b36 commit 3d87793c40181dabae558af77bdd38ddf9d0f4a1 @taxilian taxilian committed Feb 18, 2011
Showing with 5 additions and 5 deletions.
  1. +1 −1 prepmac.sh
  2. +1 −1 prepmake.sh
  3. +1 −1 src/NpapiCore/CMakeLists.txt
  4. +2 −2 src/NpapiCore/NPJavascriptObject.cpp
View
@@ -7,7 +7,7 @@ source "${0%/*}/common.sh" "$@"
ARCH=-DCMAKE_OSX_ARCHITECTURES="i386;x86_64"
pushd "$BUILDDIR"
-cmake -G "$GEN" -DPROJECTS_DIR="${PROJDIR}" ${ARCH} "$@" "${FB_ROOT}"
+cmake -G "$GEN" -DFB_PROJECTS_DIR="${PROJDIR}" ${ARCH} "$@" "${FB_ROOT}"
if [ "$?" -ne 0 ]; then
echo "CMake failed. Please check error messages"
popd > /dev/null
View
@@ -7,5 +7,5 @@ fi
source ${0%/*}/common.sh "$@"
pushd "$BUILDDIR"
-cmake -G "$GEN" -DPROJECTS_DIR="${PROJDIR}" "$@" "${FB_ROOT}"
+cmake -G "$GEN" -DFB_PROJECTS_DIR="${PROJDIR}" "$@" "${FB_ROOT}"
popd
@@ -105,5 +105,5 @@ target_link_libraries(${PROJECT_NAME}
${LIBDL_LIBRARIES}
)
-export(TARGETS NpapiCore ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES} ${LIBDL_LIBRARIES} APPEND FILE ${FB_EXPORT_FILE})
+export(TARGETS NpapiCore ${Boost_LIBRARIES} APPEND FILE ${FB_EXPORT_FILE})
@@ -34,8 +34,8 @@ bool NPJavascriptObject::isNPJavaScriptObject(const NPObject* const npo)
}
NPJavascriptObject::NPJavascriptObject(NPP npp)
- : m_valid(true), m_addEventFunc(boost::make_shared<NPO_addEventListener>(this)),
- m_removeEventFunc(boost::make_shared<NPO_removeEventListener>(this)), m_autoRelease(false)
+ : m_valid(true), m_autoRelease(false), m_addEventFunc(boost::make_shared<NPO_addEventListener>(this)),
+ m_removeEventFunc(boost::make_shared<NPO_removeEventListener>(this))
{
}

0 comments on commit 3d87793

Please sign in to comment.