this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Revert "Generate Carbon stubs"

This reverts commit b993093557583adf09af2980797c62114380deef.

+22 -76
-12
src/CMakeLists.txt
··· 176 176 ${CMAKE_CURRENT_SOURCE_DIR}/DataDetectorsNaturalLanguage/include 177 177 ${CMAKE_CURRENT_SOURCE_DIR}/SecurityInterface/include 178 178 ${CMAKE_CURRENT_SOURCE_DIR}/Carbon/include 179 - ${CMAKE_CURRENT_SOURCE_DIR}/Quartz/include 180 - ${CMAKE_CURRENT_SOURCE_DIR}/CoreImage/include 181 - ${CMAKE_CURRENT_SOURCE_DIR}/CoreVideo/include 182 - ${CMAKE_CURRENT_SOURCE_DIR}/Accelerate/include 183 - ${CMAKE_CURRENT_SOURCE_DIR}/IOSurface/include 184 - ${CMAKE_CURRENT_SOURCE_DIR}/OpenGL/include 185 179 ) 186 180 187 181 # It must be done in this scope ··· 349 343 add_subdirectory(DataDetectorsNaturalLanguage) 350 344 add_subdirectory(SecurityInterface) 351 345 add_subdirectory(Carbon) 352 - add_subdirectory(Quartz) 353 - add_subdirectory(CoreImage) 354 - add_subdirectory(CoreVideo) 355 - add_subdirectory(Accelerate) 356 - add_subdirectory(IOSurface) 357 - add_subdirectory(OpenGL) 358 346 359 347 # /Applications 360 348 #add_subdirectory(external/TextEdit)
+22 -10
src/Carbon/CMakeLists.txt
··· 1 1 project(Carbon) 2 2 3 - set(DYLIB_COMPAT_VERSION "2.0.0") 4 - set(DYLIB_CURRENT_VERSION "158.0.0") 3 + cmake_minimum_required(VERSION 2.4.0) 4 + if(COMMAND cmake_policy) 5 + cmake_policy(SET CMP0003 NEW) 6 + endif(COMMAND cmake_policy) 5 7 6 - add_framework(Carbon 7 - FAT 8 - CURRENT_VERSION 9 - VERSION "A" 8 + #configure_file(config.h.in config.h) 9 + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") 10 10 11 - SOURCES 12 - src/Carbon.c 11 + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) 12 + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) 13 + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../util) 13 14 14 - DEPENDENCIES 15 - system 15 + set(Carbon_SRCS 16 + #HIToolbox/MacWindows.cpp 16 17 ) 18 + 19 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 20 + #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 21 + SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 22 + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 23 + 24 + add_library(Carbon SHARED ${Carbon_SRCS}) 25 + target_link_libraries(Carbon util CoreServices -lX11) 26 + 27 + install(TARGETS Carbon DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 28 +
-25
src/Carbon/include/Carbon/Carbon.h
··· 1 - /* 2 - This file is part of Darling. 3 - 4 - Copyright (C) 2017 Lubos Dolezel 5 - 6 - Darling is free software: you can redistribute it and/or modify 7 - it under the terms of the GNU General Public License as published by 8 - the Free Software Foundation, either version 3 of the License, or 9 - (at your option) any later version. 10 - 11 - Darling is distributed in the hope that it will be useful, 12 - but WITHOUT ANY WARRANTY; without even the implied warranty of 13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 - GNU General Public License for more details. 15 - 16 - You should have received a copy of the GNU General Public License 17 - along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 - */ 19 - 20 - 21 - #ifndef _Carbon_H_ 22 - #define _Carbon_H_ 23 - 24 - 25 - #endif
-29
src/Carbon/src/Carbon.c
··· 1 - /* 2 - This file is part of Darling. 3 - 4 - Copyright (C) 2017 Lubos Dolezel 5 - 6 - Darling is free software: you can redistribute it and/or modify 7 - it under the terms of the GNU General Public License as published by 8 - the Free Software Foundation, either version 3 of the License, or 9 - (at your option) any later version. 10 - 11 - Darling is distributed in the hope that it will be useful, 12 - but WITHOUT ANY WARRANTY; without even the implied warranty of 13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 - GNU General Public License for more details. 15 - 16 - You should have received a copy of the GNU General Public License 17 - along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 - */ 19 - 20 - 21 - #include <Carbon/Carbon.h> 22 - #include <stdlib.h> 23 - 24 - static int verbose = 0; 25 - 26 - __attribute__((constructor)) 27 - static void initme(void) { 28 - verbose = getenv("STUB_VERBOSE") != NULL; 29 - }