Commit 22f5f494 authored by Georges Khaznadar's avatar Georges Khaznadar

fixed a missing directory during install

parent cc5e8005
...@@ -150,12 +150,12 @@ add_definitions(-DBOOST_CHRONO_HEADER_ONLY -DBOOST_NO_AUTO_PTR) ...@@ -150,12 +150,12 @@ add_definitions(-DBOOST_CHRONO_HEADER_ONLY -DBOOST_NO_AUTO_PTR)
############################################# #############################################
# Detect CCache # Detect CCache
find_program(CCacheExectuable ccache) ## find_program(CCacheExecutable ccache)
if( CCacheExectuable ) ## if( CCacheExecutable )
# only used with >=cmake-3.4 ## # only used with >=cmake-3.4
set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExectuable}" ) ## set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExecutable}" )
set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExectuable}" ) ## set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExecutable}" )
endif() ## endif()
############################################# #############################################
# Options # Options
...@@ -355,21 +355,6 @@ elseif(MINGW) ...@@ -355,21 +355,6 @@ elseif(MINGW)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign")
endif() endif()
# support for building on Raspberry Pi 1/2/3 and BBB
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
foreach(flag CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
set(${flag} "${${flag}} -mfloat-abi=hard")
set(${flag} "${${flag}} -mfpu=neon")
endforeach()
elseif(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR STREQUAL "armv6l")
foreach(flag CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
set(${flag} "${${flag}} -march=armv6")
set(${flag} "${${flag}} -mtune=arm1176jzf-s")
set(${flag} "${${flag}} -mfloat-abi=hard")
set(${flag} "${${flag}} -mfpu=vfp")
endforeach()
endif()
if (NO_GPL3) if (NO_GPL3)
add_definitions(-DNO_GPL3) add_definitions(-DNO_GPL3)
endif() endif()
......
...@@ -50,6 +50,7 @@ override_dh_auto_install: ...@@ -50,6 +50,7 @@ override_dh_auto_install:
$(CURDIR)/debian/tmp/usr/share/SuperCollider/Extensions/README $(CURDIR)/debian/tmp/usr/share/SuperCollider/Extensions/README
# this needs to be an absolute not relative softlink, # this needs to be an absolute not relative softlink,
# because supercollider copies it around. hence not using dh_link for this. # because supercollider copies it around. hence not using dh_link for this.
install -d $(CURDIR)/debian/tmp/usr/share/SuperCollider/HelpSource/lib
ln -sf /usr/share/javascript/prettify/prettify.js $(CURDIR)/debian/tmp/usr/share/SuperCollider/HelpSource/prettify.js ln -sf /usr/share/javascript/prettify/prettify.js $(CURDIR)/debian/tmp/usr/share/SuperCollider/HelpSource/prettify.js
ln -sf /usr/share/javascript/codemirror/codemirror.js $(CURDIR)/debian/tmp/usr/share/SuperCollider/HelpSource/lib/codemirror-5.39.2.min.js ln -sf /usr/share/javascript/codemirror/codemirror.js $(CURDIR)/debian/tmp/usr/share/SuperCollider/HelpSource/lib/codemirror-5.39.2.min.js
ln -sf /usr/share/javascript/codemirror/addon/mode/simple.js $(CURDIR)/debian/tmp/usr/share/SuperCollider/HelpSource/lib/codemirror-addon-simple-5.39.2.min.js ln -sf /usr/share/javascript/codemirror/addon/mode/simple.js $(CURDIR)/debian/tmp/usr/share/SuperCollider/HelpSource/lib/codemirror-addon-simple-5.39.2.min.js
......
This diff is collapsed.
...@@ -229,7 +229,7 @@ public: ...@@ -229,7 +229,7 @@ public:
#ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
time_duration offset = seconds(get_secs() - ntp_offset) + nanoseconds(get_nanoseconds()); time_duration offset = seconds(get_secs() - ntp_offset) + nanoseconds(get_nanoseconds());
#else #else
time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000); time_duration offset = seconds(get_secs() - ntp_offset) + microseconds((long) get_nanoseconds()/1000);
#endif #endif
return ptime(base, offset); return ptime(base, offset);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment