Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

QtCollider: synchronize with main SuperCollider

  • Loading branch information...
commit 9f46ab8521542d138ed2760dc8e6905c65a3db2d 2 parents cfd824f + b182670
Jakob Leben jleben authored
2  CMakeLists.txt
View
@@ -29,7 +29,7 @@ ADD_CUSTOM_TARGET(setMainVersion ALL
if(APPLE)
STRING(REGEX REPLACE "^.*MacOSX10.([0-9]+).*$" "\\1" MAC_OSX_SDK_VERSION "${CMAKE_OSX_SYSROOT}")
- if($MAC_OSX_SDK_VERSION GREATER 4)
+ if(MAC_OSX_SDK_VERSION GREATER 4)
set(HID_UTIL_DIR "HID_Utilities")
else()
set(HID_UTIL_DIR "HID_Utilities_10_4")
2  SCClassLibrary/Common/Files/File.sc
View
@@ -41,6 +41,7 @@ File : UnixFILE {
close { // close the file
// the GC will not call this for you
this.prClose;
+ fileptr = nil;
openFiles.remove(this);
}
length { // returns the length of the file
@@ -123,6 +124,7 @@ Pipe : UnixFILE {
close {
this.prClose;
+ fileptr = nil;
openFiles.remove(this);
}
2  lang/CMakeLists.txt
View
@@ -109,7 +109,7 @@ if(UNIX)
LangPrimSource/SC_Speech.M
)
add_definitions(-DHAVE_SPEECH)
- if($MAC_OSX_SDK_VERSION GREATER 4)
+ if(MAC_OSX_SDK_VERSION GREATER 4)
list(APPEND sclang_sources
"LangPrimSource/${HID_UTIL_DIR}/IOHIDElement_.c"
"LangPrimSource/${HID_UTIL_DIR}/IOHIDDevice_.c"
6 platform/mac/CMakeLists.txt
View
@@ -113,10 +113,10 @@ set(scapp_sources
${CMAKE_SOURCE_DIR}/editors/scapp/SMLAdvancedFind/ICU/NSStringICUAdditions.m
)
-if($MAC_OSX_SDK_VERSION GREATER 4)
+if(MAC_OSX_SDK_VERSION GREATER 4)
list(APPEND scapp_sources
- "LangPrimSource/${HID_UTIL_DIR}/IOHIDElement_.c"
- "LangPrimSource/${HID_UTIL_DIR}/IOHIDDevice_.c"
+ "${CMAKE_SOURCE_DIR}/lang/LangPrimSource/${HID_UTIL_DIR}/IOHIDElement_.c"
+ "${CMAKE_SOURCE_DIR}/lang/LangPrimSource/${HID_UTIL_DIR}/IOHIDDevice_.c"
)
endif()
Please sign in to comment.
Something went wrong with that request. Please try again.