diff options
author | jan Iversen <jani@documentfoundation.org> | 2017-02-02 20:27:50 +0100 |
---|---|---|
committer | jan Iversen <jani@documentfoundation.org> | 2017-02-02 20:29:05 +0100 |
commit | 8944a4dc98ff4e1028936aa7c287f57183aa9b56 (patch) | |
tree | 131928c50365e607c039059f97961eef7416577e | |
parent | 23f7e82c7bafd3af97466761e01667d583db6af8 (diff) |
gbuild-to-ide added -DLIBO_INTERNAL_ONLY to CXXFLAGS
In order to compile correct this flag is needed and
it is not exported in the json files
Change-Id: Ib8f0b882f2d59ed467a9198c148263e2882c60b3
-rwxr-xr-x | bin/gbuild-to-ide | 1 | ||||
-rw-r--r-- | compile_commands.json | 1 | ||||
-rw-r--r-- | osx/janTestLib/janTestLib.h | 13 | ||||
-rw-r--r-- | osx/janTestLib/janTestLib.m | 13 | ||||
-rw-r--r-- | osx/jantest/LibMain.cpp | 15 | ||||
-rw-r--r-- | osx/jantest/UnittestMain.cpp | 15 |
6 files changed, 2 insertions, 56 deletions
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index 0ab45d1c1363..7c6d6600663b 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -123,6 +123,7 @@ class GbuildParser: jsondata['target_name'] = module + '_' + jsontype + '_' + match jsondata['DEFS'] = GbuildParser.__split_defs(jsondata['DEFS']) jsondata['LINKED_LIBS'] = jsondata['LINKED_LIBS'].strip().split(' ') + jsondata['CXXFLAGS'] += ' -DLIBO_INTERNAL_ONLY' for i in ['CXXFLAGS', 'CFLAGS', 'OBJCFLAGS', 'OBJCXXFLAGS']: jsondata[i] = GbuildParser.__split_flags(jsondata[i], jsondata[i+'APPEND']) for i in jsonSrc: diff --git a/compile_commands.json b/compile_commands.json new file mode 100644 index 000000000000..9027ee55e1a9 --- /dev/null +++ b/compile_commands.json @@ -0,0 +1 @@ +[{"command": "clang++ -Wall -DMACOSX_SDK_VERSION=101200 -DBOOST_ERROR_CODE_HEADER_ONLY -DSAL_LOG_INFO -DSYSTEM_LIBXML -DBOOST_SYSTEM_NO_DEPRECATED -DUNX -DUNIX -D_PTHREADS -DLIBO_INTERNAL_ONLY -DMAC_OS_X_VERSION_MIN_REQUIRED=1080 -DOSL_DEBUG_LEVEL=1 -DX86_64 -DSAL_LOG_WARN -DNO_PTHREAD_PRIORITY -DMAC_OS_X_VERSION_MAX_ALLOWED=101200 -DMACOSX -D_REENTRANT -DCPPU_ENV=gcc3 -I/Volumes/LIBREOFFICE/play/xcode_core/l10ntools/source -Iexternal/boost/include -I/Volumes/LIBREOFFICE/play/xcode/workdir/UnpackedTarball/boost -Il10ntools/inc -Iinclude -I/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/include/darwin -I/Volumes/LIBREOFFICE/play/xcode/config_host -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include/libxml2 -fmessage-length=0 -fno-common -pipe -fno-threadsafe-statics -fvisibility-inlines-hidden -fstack-protector-strong -fPIC -fno-strict-aliasing -fsigned-char -std=gnu++14 -c /Volumes/LIBREOFFICE/play/xcode_core/l10ntools/source/pocheck.cxx", "directory": "/Volumes/LIBREOFFICE/play/xcode_core/l10ntools", "file": "/Volumes/LIBREOFFICE/play/xcode_core/l10ntools/source/pocheck.cxx"}]
\ No newline at end of file diff --git a/osx/janTestLib/janTestLib.h b/osx/janTestLib/janTestLib.h deleted file mode 100644 index ecd13097d6fb..000000000000 --- a/osx/janTestLib/janTestLib.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// janTestLib.h -// janTestLib -// -// Created by Jan Iversen on 29/01/2017. -// Copyright © 2017 Jan Iversen. All rights reserved. -// - -#import <Foundation/Foundation.h> - -@interface janTestLib : NSObject - -@end diff --git a/osx/janTestLib/janTestLib.m b/osx/janTestLib/janTestLib.m deleted file mode 100644 index 365103e2efee..000000000000 --- a/osx/janTestLib/janTestLib.m +++ /dev/null @@ -1,13 +0,0 @@ -// -// janTestLib.m -// janTestLib -// -// Created by Jan Iversen on 29/01/2017. -// Copyright © 2017 Jan Iversen. All rights reserved. -// - -#import "janTestLib.h" - -@implementation janTestLib - -@end diff --git a/osx/jantest/LibMain.cpp b/osx/jantest/LibMain.cpp deleted file mode 100644 index 20a59c3b86ff..000000000000 --- a/osx/jantest/LibMain.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// -// main.cpp -// jantest -// -// Created by Jan Iversen on 29/01/2017. -// Copyright © 2017 Jan Iversen. All rights reserved. -// - -#include <iostream> - -int main(int argc, const char * argv[]) { - // insert code here... - std::cout << "Hello, World!\n"; - return 0; -} diff --git a/osx/jantest/UnittestMain.cpp b/osx/jantest/UnittestMain.cpp deleted file mode 100644 index 20a59c3b86ff..000000000000 --- a/osx/jantest/UnittestMain.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// -// main.cpp -// jantest -// -// Created by Jan Iversen on 29/01/2017. -// Copyright © 2017 Jan Iversen. All rights reserved. -// - -#include <iostream> - -int main(int argc, const char * argv[]) { - // insert code here... - std::cout << "Hello, World!\n"; - return 0; -} |