diff --git a/.DS_Store b/.DS_Store index 2036d77..2e5334a 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Build/.DS_Store b/Build/.DS_Store index 364d0a4..f1e3614 100644 Binary files a/Build/.DS_Store and b/Build/.DS_Store differ diff --git a/Build/Screen.u_xcomp/Contents/MacOS/Screen b/Build/Screen.u_xcomp/Contents/MacOS/Screen index 6256e2e..316e622 100755 Binary files a/Build/Screen.u_xcomp/Contents/MacOS/Screen and b/Build/Screen.u_xcomp/Contents/MacOS/Screen differ diff --git a/Build/Screen.u_xcomp/Contents/Resources/English.lproj/InfoPlist.strings b/Build/Screen.u_xcomp/Contents/Resources/English.lproj/InfoPlist.strings deleted file mode 100644 index a700840..0000000 Binary files a/Build/Screen.u_xcomp/Contents/Resources/English.lproj/InfoPlist.strings and /dev/null differ diff --git a/Build/Screen.u_xcomp/Contents/_CodeSignature/CodeResources b/Build/Screen.u_xcomp/Contents/_CodeSignature/CodeResources index c636f1b..3a253da 100644 --- a/Build/Screen.u_xcomp/Contents/_CodeSignature/CodeResources +++ b/Build/Screen.u_xcomp/Contents/_CodeSignature/CodeResources @@ -8,15 +8,6 @@ yihQNYOsLVDCPkyIDQ49JAE04lY= - Resources/English.lproj/InfoPlist.strings - - hash - - RrYQ92PgFYyvBz1akaG1TXp+2Nw= - - optional - - Resources/GENERIC.PNG 29DpZc5azEl6hRRHzRg5UbxPeco= @@ -39,19 +30,6 @@ dq2kAxKxNO8qeNhMdnnHCmhO3dLQrCF3NwTjY9UvnE4= - Resources/English.lproj/InfoPlist.strings - - hash - - RrYQ92PgFYyvBz1akaG1TXp+2Nw= - - hash2 - - my2FlytJxKUQqUgy2Hngfd1Ofv8oRUeMNCOllOUmnto= - - optional - - Resources/GENERIC.PNG hash diff --git a/English.lproj/InfoPlist.strings b/English.lproj/InfoPlist.strings index 1192ea7..6820021 100755 --- a/English.lproj/InfoPlist.strings +++ b/English.lproj/InfoPlist.strings @@ -3,6 +3,6 @@ CFBundleName - Screen + generic diff --git a/English.lproj/Screen.rc b/English.lproj/Screen.rc index fb192b4..de2be18 100755 --- a/English.lproj/Screen.rc +++ b/English.lproj/Screen.rc @@ -1,4 +1,3 @@ - 1 BITMAP DISCARDABLE "GENERIC.BMP" STRINGTABLE DISCARDABLE @@ -11,5 +10,3 @@ BEGIN 8001 "$dock:$dock() Returns a list with a single row, detailing the position and height of the dock. position code: -1 is left, 0 is bottom, 1 is right" 7000 "$currentScreens:$currentScreens() Returns a list of screens, cached and updated automatically when the screens change" END - - diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f86901d..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 Suran Systems, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index 07e6a45..2e4efde 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Now copy the package tools/omnisrc64.app to xcode's tools folder, like this: Still in OSX-SDK-10.1, clone the git repo -`git clone git@github.com:suransys/screen-xcomp.git` +`git clone ssh://git@bitbucket.suran.com:7999/sda/screen-xcomp.git` In Finder, open the new cloned directory, called screen-xcomp. Open the package Screen.xcodeproj using Xcode (Clicking on this file should open it with Xcode automatically) @@ -81,7 +81,3 @@ ________________ `position` is an integer, either -1, 0, or 1. This tells you whether the dock is on the left, bottom, or right side of the screen, respectively `height` is the height of the dock, measured from its anchoring wall. So if the dock is anchored to the right or left side, then "height" will technically be the width, since the dock is sideways - -## Contributing -Please see our [guide to contributing](https://github.com/suransys/contributing). - diff --git a/Screen.xcodeproj/project.pbxproj b/Screen.xcodeproj/project.pbxproj index 07db0fb..c1c87af 100755 --- a/Screen.xcodeproj/project.pbxproj +++ b/Screen.xcodeproj/project.pbxproj @@ -10,7 +10,6 @@ 0C962E332411532200894DDF /* ObjCScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C962E322411532200894DDF /* ObjCScreen.m */; }; 0C962E362411538700894DDF /* ScreenInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0C962E352411538700894DDF /* ScreenInterface.mm */; }; 2D7566E417BE308C001F871F /* Screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D7566E317BE308C001F871F /* Screen.cpp */; }; - 2D7DE4B517CE03B300642BA9 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2D7DE4B217CE03B300642BA9 /* InfoPlist.strings */; }; 2DAD106F17BCEE60005A7F56 /* u_complib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DAD106E17BCEE60005A7F56 /* u_complib.framework */; }; 2DD7697817BBA5F4005F1CFB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD7697717BBA5F4005F1CFB /* Cocoa.framework */; }; 2DDD8B9217F437A200F4E765 /* Screen.rc in Resources */ = {isa = PBXBuildFile; fileRef = 2D7DE4B017CE03B300642BA9 /* Screen.rc */; }; @@ -28,7 +27,7 @@ outputFiles = ( "$(TEMP_FILE_DIR)/omnisrc/Localizable.strings", ); - script = "$DEVELOPER_TOOLS_DIR/omnisrc64.app/Contents/MacOS/omnisrc64 INPUT_FILE_PATH TEMP_FILE_DIR REZ_SEARCH_PATHS XCOMP\nif [ -f $TEMP_FILE_DIR/omnisrc/Bitmap.strings ]; then\ncp $TEMP_FILE_DIR/omnisrc/Bitmap.strings $INSTALL_DIR/$CONTENTS_FOLDER_PATH/Resources\nfi\nshopt -s nullglob\nif [ ! -z \"`echo $TEMP_FILE_DIR/omnisrc/*.PNG`\" ]; then\ncp $TEMP_FILE_DIR/omnisrc/*.PNG $INSTALL_DIR/$CONTENTS_FOLDER_PATH/Resources\nfi"; + script = "$DEVELOPER_TOOLS_DIR/omnisrc64.app/Contents/MacOS/omnisrc64 INPUT_FILE_PATH TEMP_FILE_DIR REZ_SEARCH_PATHS XCOMP\nif [ -f $TEMP_FILE_DIR/omnisrc/Bitmap.strings ]; then\ncp $TEMP_FILE_DIR/omnisrc/Bitmap.strings $INSTALL_DIR/$CONTENTS_FOLDER_PATH/Resources\nfi\nshopt -s nullglob\nif [ ! -z \"`echo $TEMP_FILE_DIR/omnisrc/*.PNG`\" ]; then\ncp $TEMP_FILE_DIR/omnisrc/*.PNG $INSTALL_DIR/$CONTENTS_FOLDER_PATH/Resources\nfi\n"; }; /* End PBXBuildRule section */ @@ -186,7 +185,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2D7DE4B517CE03B300642BA9 /* InfoPlist.strings in Resources */, 2DDD8B9217F437A200F4E765 /* Screen.rc in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Screen.xcodeproj/project.xcworkspace/xcuserdata/malachi.xcuserdatad/UserInterfaceState.xcuserstate b/Screen.xcodeproj/project.xcworkspace/xcuserdata/malachi.xcuserdatad/UserInterfaceState.xcuserstate index cdccc3d..23ccd57 100644 Binary files a/Screen.xcodeproj/project.xcworkspace/xcuserdata/malachi.xcuserdatad/UserInterfaceState.xcuserstate and b/Screen.xcodeproj/project.xcworkspace/xcuserdata/malachi.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Src/ObjCScreen.h b/Src/ObjCScreen.h index a828b65..8e4351c 100644 --- a/Src/ObjCScreen.h +++ b/Src/ObjCScreen.h @@ -14,15 +14,10 @@ @interface ObjCScreen : NSObject -@property void (*callback)(void*); -@property void * userInfo; - -(NSArray*)getObjCScreens; -(NSScreen *)getMainScreen; -(int)getDockLocation; --(void)setScreensChangedNotification:(void (*)(void*))callback withUserInfo:(void *) userInfo; - @end diff --git a/Src/ObjCScreen.m b/Src/ObjCScreen.m index 7e299ed..9db40c8 100644 --- a/Src/ObjCScreen.m +++ b/Src/ObjCScreen.m @@ -29,14 +29,4 @@ -(int)getDockLocation{ return INT_MAX; } --(void)setScreensChangedNotification:(void (*)(void*))callback withUserInfo:(void *)userInfo{ - self.callback = callback; - self.userInfo = userInfo; - [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(onScreenChanged:) name:NSApplicationDidChangeScreenParametersNotification object:nil]; -} - --(void)onScreenChanged:(NSNotification*)notification{ - self.callback(self.userInfo); -} - @end diff --git a/Src/Screen.cpp b/Src/Screen.cpp index ef5dfd6..52cff01 100755 --- a/Src/Screen.cpp +++ b/Src/Screen.cpp @@ -47,10 +47,7 @@ void staticOnScreenChanged(std::vector screens, void* userInfo){ } ScreenObject::ScreenObject(){ - updatingScreen = UpdatingScreen(); - currentScreens = updatingScreen.getCurrentScreens(); - updatingScreen.setScreenChangeCallback(staticOnScreenChanged, this); - updatingScreen.screenRunLoop(); + currentScreens = Screen::screenList(); } EXTfldval ScreenObject::staticMethodCall(qlong methodId){ @@ -207,6 +204,30 @@ void ScreenObject::onScreenChanged(std::vector screens){ currentScreens = screens; } +@interface screenObserver : NSObject +{ +} +@property void (*callback)(std::vector, void*); +@property void* target; + +-(void)setScreenChangeCallback:(void (*)(std::vector, void*))callback onTarget:(void *)target; +@end + +@implementation screenObserver +-(void)didChangeScreenParameters: (NSNotification*)notification +{ + if (!self.callback) return; + self.callback(Screen::screenList(), self.target); +} + +-(void)setScreenChangeCallback:(void (*)(std::vector, void *))callback onTarget:(void *)target{ + self.target = target; + self.callback = callback; +} +@end + +screenObserver* gObserver; + // Component library entry point (name as declared in resource 31000 ) extern "C" LRESULT OMNISWNDPROC ScreenWndProc(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam, EXTCompInfo* eci) @@ -223,10 +244,13 @@ extern "C" LRESULT OMNISWNDPROC ScreenWndProc(HWND hwnd, UINT Msg, WPARAM wParam // For most components this can be removed - see other BLYTH component examples case ECM_CONNECT: { - return EXT_FLAG_LOADED|EXT_FLAG_ALWAYS_USABLE|EXT_FLAG_NVOBJECTS; // Return external flags + gObserver = [[screenObserver alloc] init]; + [[NSNotificationCenter defaultCenter] addObserver:gObserver selector:@selector(didChangeScreenParameters:) name:NSApplicationDidChangeScreenParametersNotification object:[NSApplication sharedApplication]]; + return EXT_FLAG_LOADED|EXT_FLAG_ALWAYS_USABLE|EXT_FLAG_NVOBJECTS; } case ECM_OBJCONSTRUCT:{ ScreenObject * screenObject = new ScreenObject(); + [gObserver setScreenChangeCallback:staticOnScreenChanged onTarget:screenObject]; ECOinsertObject(eci, hwnd, (void*)screenObject); return qtrue; } @@ -245,6 +269,8 @@ extern "C" LRESULT OMNISWNDPROC ScreenWndProc(HWND hwnd, UINT Msg, WPARAM wParam // For most components this can be removed - see other BLYTH component examples case ECM_DISCONNECT: { + [[NSNotificationCenter defaultCenter] removeObserver:gObserver]; + gObserver = nil; return qtrue; } @@ -273,8 +299,6 @@ extern "C" LRESULT OMNISWNDPROC ScreenWndProc(HWND hwnd, UINT Msg, WPARAM wParam case ECM_GETOBJECT:{ return ECOreturnObjects(gInstLib, eci, &screenObject[0], OBJECT_COUNT); } -// case ECM_GETMETHODNAME: -// return ECOreturnMethods(gInstLib, eci, &screensFunction[0], NUMBER_OF_METHODS); case ECM_METHODCALL:{ ScreenObject * object = (ScreenObject*)ECOfindObject(eci, hwnd); if (!object) { diff --git a/Src/Screen.he b/Src/Screen.he index 0c5edbf..c5c7c4f 100755 --- a/Src/Screen.he +++ b/Src/Screen.he @@ -11,7 +11,6 @@ class ScreenObject { private: std::vector currentScreens; - UpdatingScreen updatingScreen; static EXTqlist * retrieveScreens(); static EXTqlist * screenListFromVector(std::vector); @@ -21,7 +20,6 @@ private: static EXTqlist * retrieveDock(); public: - ScreenObject(); static EXTfldval staticMethodCall(qlong); diff --git a/Src/ScreenInterface.h b/Src/ScreenInterface.h index 69187da..85a0c1d 100644 --- a/Src/ScreenInterface.h +++ b/Src/ScreenInterface.h @@ -29,24 +29,4 @@ class Screen { static int dockPosition(); }; - - -class UpdatingScreen{ - std::vector currentScreens; - void notifyScreensChanged(); - static void screensChangedCallback(void*); - void (*_onScreenChanged)(std::vector, void*); - void * currentUserInfo; - - void * objCScreen; -public: - UpdatingScreen(); - - std::vector getCurrentScreens(); - void setScreenChangeCallback(void (*onScreenChanged)(std::vector, void*), void* userInfo); - void resetCurrentScreens(); - void screenRunLoop(); - void screenEndLoop(); -}; - #endif /* Screen_hpp */ diff --git a/Src/ScreenInterface.mm b/Src/ScreenInterface.mm index 6ef070a..e881dfb 100644 --- a/Src/ScreenInterface.mm +++ b/Src/ScreenInterface.mm @@ -44,48 +44,4 @@ } -void UpdatingScreen::screensChangedCallback(void *userInfo){ - if (!userInfo) return; - UpdatingScreen * instUpdatingScreen = (UpdatingScreen*)userInfo; - if (!instUpdatingScreen) return; - instUpdatingScreen -> resetCurrentScreens(); -} - -UpdatingScreen::UpdatingScreen(){ - currentScreens = Screen::screenList(); - - ObjCScreen * localScreen =[[ObjCScreen alloc] init]; - [localScreen setScreensChangedNotification:screensChangedCallback withUserInfo:this]; - - objCScreen = (__bridge void*)localScreen; -} - -void UpdatingScreen::setScreenChangeCallback(void (*onScreenChanged)(std::vector, void*), void* userInfo){ - _onScreenChanged = onScreenChanged; - currentUserInfo = userInfo; -} - -void UpdatingScreen::notifyScreensChanged(){ - if (_onScreenChanged){ - _onScreenChanged(currentScreens, currentUserInfo); - } -} - -void UpdatingScreen::resetCurrentScreens(){ - currentScreens = Screen::screenList(); - notifyScreensChanged(); -} - -void UpdatingScreen::screenRunLoop(){ - NSApplicationLoad(); - CFRunLoopRun(); -} - -void UpdatingScreen::screenEndLoop(){ - CFRunLoopStop(CFRunLoopGetCurrent()); -} - -std::vector UpdatingScreen::getCurrentScreens(){ - return currentScreens; -} diff --git a/UnicodeCore.build/.DS_Store b/UnicodeCore.build/.DS_Store new file mode 100644 index 0000000..226c889 Binary files /dev/null and b/UnicodeCore.build/.DS_Store differ diff --git a/UnicodeCore.build/Objects-normal/x86_64/ObjCScreen.d b/UnicodeCore.build/Objects-normal/x86_64/ObjCScreen.d index ea07633..4cca47e 100644 --- a/UnicodeCore.build/Objects-normal/x86_64/ObjCScreen.d +++ b/UnicodeCore.build/Objects-normal/x86_64/ObjCScreen.d @@ -1,5 +1,5 @@ dependencies: \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/omnisinc.h \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/../complib/u_complib.framework/Headers/carbnuni.h \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/Src/ObjCScreen.m \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/Src/ObjCScreen.h + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/omnisinc.h \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/../complib/u_complib.framework/Headers/carbnuni.h \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/Src/ObjCScreen.m \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/Src/ObjCScreen.h diff --git a/UnicodeCore.build/Objects-normal/x86_64/ObjCScreen.o b/UnicodeCore.build/Objects-normal/x86_64/ObjCScreen.o index 9fc0a34..b67ae16 100644 Binary files a/UnicodeCore.build/Objects-normal/x86_64/ObjCScreen.o and b/UnicodeCore.build/Objects-normal/x86_64/ObjCScreen.o differ diff --git a/UnicodeCore.build/Objects-normal/x86_64/Screen.LinkFileList b/UnicodeCore.build/Objects-normal/x86_64/Screen.LinkFileList index a1af84e..95cc4df 100644 --- a/UnicodeCore.build/Objects-normal/x86_64/Screen.LinkFileList +++ b/UnicodeCore.build/Objects-normal/x86_64/Screen.LinkFileList @@ -1,3 +1,3 @@ -/Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/UnicodeCore.build/Objects-normal/x86_64/Screen.o -/Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/UnicodeCore.build/Objects-normal/x86_64/ObjCScreen.o -/Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/UnicodeCore.build/Objects-normal/x86_64/ScreenInterface.o +/Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/UnicodeCore.build/Objects-normal/x86_64/Screen.o +/Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/UnicodeCore.build/Objects-normal/x86_64/ObjCScreen.o +/Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/UnicodeCore.build/Objects-normal/x86_64/ScreenInterface.o diff --git a/UnicodeCore.build/Objects-normal/x86_64/Screen.d b/UnicodeCore.build/Objects-normal/x86_64/Screen.d index a9a1b2c..241fe9d 100644 --- a/UnicodeCore.build/Objects-normal/x86_64/Screen.d +++ b/UnicodeCore.build/Objects-normal/x86_64/Screen.d @@ -1,37 +1,37 @@ dependencies: \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/omnisinc.h \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/../complib/u_complib.framework/Headers/carbnuni.h \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/src/Screen.cpp \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/extcomp.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/basics.h \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/xbasics.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/xfileext.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/chrbasic.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/omstring.c \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/omstring.h \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/hwnd.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/xhwnd.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/gdi.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/xgdi.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/xbitmap.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/xgdi_rgn.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/xgdiinl.hi \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/xhwndinl.hi \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/gdipict.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/strclass.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/extfval.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/extcrb.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/extfuncs.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/extdefs.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/extqlist.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/extbmp.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/anums.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/xkey.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/pri.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/xpri.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/extfile.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/flddefs.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/xextcinl.hi \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/handle.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/src/Screen.he \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/src/ScreenInterface.h + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/omnisinc.h \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/../complib/u_complib.framework/Headers/carbnuni.h \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/src/Screen.cpp \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extcomp.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/basics.h \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xbasics.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xfileext.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/chrbasic.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/omstring.c \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/omstring.h \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/hwnd.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xhwnd.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/gdi.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xgdi.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xbitmap.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xgdi_rgn.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xgdiinl.hi \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xhwndinl.hi \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/gdipict.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/strclass.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extfval.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extcrb.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extfuncs.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extdefs.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extqlist.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extbmp.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/anums.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xkey.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/pri.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xpri.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extfile.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/flddefs.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xextcinl.hi \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/handle.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/src/Screen.he \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/src/ScreenInterface.h diff --git a/UnicodeCore.build/Objects-normal/x86_64/Screen.o b/UnicodeCore.build/Objects-normal/x86_64/Screen.o index 6bfd900..f38b63e 100644 Binary files a/UnicodeCore.build/Objects-normal/x86_64/Screen.o and b/UnicodeCore.build/Objects-normal/x86_64/Screen.o differ diff --git a/UnicodeCore.build/Objects-normal/x86_64/ScreenInterface.d b/UnicodeCore.build/Objects-normal/x86_64/ScreenInterface.d index 06303b5..7b84855 100644 --- a/UnicodeCore.build/Objects-normal/x86_64/ScreenInterface.d +++ b/UnicodeCore.build/Objects-normal/x86_64/ScreenInterface.d @@ -1,6 +1,6 @@ dependencies: \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/complib/u_complib.framework/Headers/omnisinc.h \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/../complib/u_complib.framework/Headers/carbnuni.h \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/Src/ScreenInterface.mm \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/Src/ScreenInterface.h \ - /Users/malachi/Documents/learning/c++/OSX-SDK-10.1/screen-xcomp/Src/ObjCScreen.h + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/omnisinc.h \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/../complib/u_complib.framework/Headers/carbnuni.h \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/Src/ScreenInterface.mm \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/Src/ScreenInterface.h \ + /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/screen-xcomp/Src/ObjCScreen.h diff --git a/UnicodeCore.build/Objects-normal/x86_64/ScreenInterface.o b/UnicodeCore.build/Objects-normal/x86_64/ScreenInterface.o index ecc3988..223b337 100644 Binary files a/UnicodeCore.build/Objects-normal/x86_64/ScreenInterface.o and b/UnicodeCore.build/Objects-normal/x86_64/ScreenInterface.o differ diff --git a/UnicodeCore.build/Objects-normal/x86_64/Screen_dependency_info.dat b/UnicodeCore.build/Objects-normal/x86_64/Screen_dependency_info.dat index 8891556..905bb91 100644 Binary files a/UnicodeCore.build/Objects-normal/x86_64/Screen_dependency_info.dat and b/UnicodeCore.build/Objects-normal/x86_64/Screen_dependency_info.dat differ diff --git a/UnicodeCore.build/Objects-normal/x86_64/generic.LinkFileList b/UnicodeCore.build/Objects-normal/x86_64/generic.LinkFileList deleted file mode 100644 index fa17b9e..0000000 --- a/UnicodeCore.build/Objects-normal/x86_64/generic.LinkFileList +++ /dev/null @@ -1 +0,0 @@ -/Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/generic/UnicodeCore.build/Objects-normal/x86_64/generic.o diff --git a/UnicodeCore.build/Objects-normal/x86_64/generic.d b/UnicodeCore.build/Objects-normal/x86_64/generic.d deleted file mode 100644 index 862df08..0000000 --- a/UnicodeCore.build/Objects-normal/x86_64/generic.d +++ /dev/null @@ -1,36 +0,0 @@ -dependencies: \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/omnisinc.h \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/generic/../complib/u_complib.framework/Headers/carbnuni.h \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/generic/src/generic.cpp \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extcomp.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/basics.h \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xbasics.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xfileext.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/chrbasic.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/omstring.c \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/omstring.h \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/hwnd.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xhwnd.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/gdi.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xgdi.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xbitmap.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xgdi_rgn.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xgdiinl.hi \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xhwndinl.hi \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/gdipict.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/strclass.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extfval.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extcrb.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extfuncs.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extdefs.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extqlist.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extbmp.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/anums.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xkey.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/pri.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xpri.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/extfile.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/flddefs.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/xextcinl.hi \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/complib/u_complib.framework/Headers/handle.he \ - /Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/generic/src/generic.he diff --git a/UnicodeCore.build/Objects-normal/x86_64/generic.dia b/UnicodeCore.build/Objects-normal/x86_64/generic.dia deleted file mode 100644 index c85cbfc..0000000 Binary files a/UnicodeCore.build/Objects-normal/x86_64/generic.dia and /dev/null differ diff --git a/UnicodeCore.build/Objects-normal/x86_64/generic.o b/UnicodeCore.build/Objects-normal/x86_64/generic.o deleted file mode 100644 index 32807b5..0000000 Binary files a/UnicodeCore.build/Objects-normal/x86_64/generic.o and /dev/null differ diff --git a/UnicodeCore.build/Objects-normal/x86_64/generic_dependency_info.dat b/UnicodeCore.build/Objects-normal/x86_64/generic_dependency_info.dat deleted file mode 100644 index 0bf29df..0000000 Binary files a/UnicodeCore.build/Objects-normal/x86_64/generic_dependency_info.dat and /dev/null differ diff --git a/UnicodeCore.build/Objects-normal/x86_64/genericqqq.LinkFileList b/UnicodeCore.build/Objects-normal/x86_64/genericqqq.LinkFileList deleted file mode 100644 index fa17b9e..0000000 --- a/UnicodeCore.build/Objects-normal/x86_64/genericqqq.LinkFileList +++ /dev/null @@ -1 +0,0 @@ -/Users/malachi/Documents/Suran/Code/OSX-SDK-10.1/generic/UnicodeCore.build/Objects-normal/x86_64/generic.o diff --git a/UnicodeCore.build/Objects-normal/x86_64/genericqqq_dependency_info.dat b/UnicodeCore.build/Objects-normal/x86_64/genericqqq_dependency_info.dat deleted file mode 100644 index b56e9f9..0000000 Binary files a/UnicodeCore.build/Objects-normal/x86_64/genericqqq_dependency_info.dat and /dev/null differ diff --git a/UnicodeCore.build/Screen-generated-files.hmap b/UnicodeCore.build/Screen-generated-files.hmap index e3d6083..edd2ad4 100644 Binary files a/UnicodeCore.build/Screen-generated-files.hmap and b/UnicodeCore.build/Screen-generated-files.hmap differ diff --git a/UnicodeCore.build/Screen-project-headers.hmap b/UnicodeCore.build/Screen-project-headers.hmap index b59a672..2fbdb32 100644 Binary files a/UnicodeCore.build/Screen-project-headers.hmap and b/UnicodeCore.build/Screen-project-headers.hmap differ diff --git a/UnicodeCore.build/generic-all-non-framework-target-headers.hmap b/UnicodeCore.build/generic-all-non-framework-target-headers.hmap deleted file mode 100644 index dd8b535..0000000 Binary files a/UnicodeCore.build/generic-all-non-framework-target-headers.hmap and /dev/null differ diff --git a/UnicodeCore.build/generic-all-target-headers.hmap b/UnicodeCore.build/generic-all-target-headers.hmap deleted file mode 100644 index dd8b535..0000000 Binary files a/UnicodeCore.build/generic-all-target-headers.hmap and /dev/null differ diff --git a/UnicodeCore.build/generic-generated-files.hmap b/UnicodeCore.build/generic-generated-files.hmap deleted file mode 100644 index 097b42f..0000000 Binary files a/UnicodeCore.build/generic-generated-files.hmap and /dev/null differ diff --git a/UnicodeCore.build/generic-own-target-headers.hmap b/UnicodeCore.build/generic-own-target-headers.hmap deleted file mode 100644 index dd8b535..0000000 Binary files a/UnicodeCore.build/generic-own-target-headers.hmap and /dev/null differ diff --git a/UnicodeCore.build/generic-project-headers.hmap b/UnicodeCore.build/generic-project-headers.hmap deleted file mode 100644 index dd8b535..0000000 Binary files a/UnicodeCore.build/generic-project-headers.hmap and /dev/null differ diff --git a/UnicodeCore.build/generic.hmap b/UnicodeCore.build/generic.hmap deleted file mode 100644 index dd8b535..0000000 Binary files a/UnicodeCore.build/generic.hmap and /dev/null differ diff --git a/UnicodeCore.build/genericqqq-all-non-framework-target-headers.hmap b/UnicodeCore.build/genericqqq-all-non-framework-target-headers.hmap deleted file mode 100644 index dd8b535..0000000 Binary files a/UnicodeCore.build/genericqqq-all-non-framework-target-headers.hmap and /dev/null differ diff --git a/UnicodeCore.build/genericqqq-all-target-headers.hmap b/UnicodeCore.build/genericqqq-all-target-headers.hmap deleted file mode 100644 index dd8b535..0000000 Binary files a/UnicodeCore.build/genericqqq-all-target-headers.hmap and /dev/null differ diff --git a/UnicodeCore.build/genericqqq-generated-files.hmap b/UnicodeCore.build/genericqqq-generated-files.hmap deleted file mode 100644 index dd6ff8c..0000000 Binary files a/UnicodeCore.build/genericqqq-generated-files.hmap and /dev/null differ diff --git a/UnicodeCore.build/genericqqq-own-target-headers.hmap b/UnicodeCore.build/genericqqq-own-target-headers.hmap deleted file mode 100644 index dd8b535..0000000 Binary files a/UnicodeCore.build/genericqqq-own-target-headers.hmap and /dev/null differ diff --git a/UnicodeCore.build/genericqqq-project-headers.hmap b/UnicodeCore.build/genericqqq-project-headers.hmap deleted file mode 100644 index dd8b535..0000000 Binary files a/UnicodeCore.build/genericqqq-project-headers.hmap and /dev/null differ diff --git a/UnicodeCore.build/genericqqq.hmap b/UnicodeCore.build/genericqqq.hmap deleted file mode 100644 index dd8b535..0000000 Binary files a/UnicodeCore.build/genericqqq.hmap and /dev/null differ