Skip to content

Commit 95458d4

Browse files
RavbugRavbug
committed
Fix mac compilation
interface_derived.cpp ~ fix crash on switching tabs due to uninitialized timer project.pbxproj ~ fix globals.cpp -> globals.h
1 parent e2be86c commit 95458d4

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

‎mac.xcodeproj/project.pbxproj

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
AA012115224C24D4000F4F82 /* wxmac.icns in Resources */ = {isa = PBXBuildFile; fileRef = AA012113224C24D4000F4F82 /* wxmac.icns */; };
1414
AA14A0F3222A1219002C4553 /* libwx_osx_cocoa.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1D0F81222A0A1D00678304 /* libwx_osx_cocoa.dylib */; };
1515
AA256DE12367942600F9EA58 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA256DC72367942600F9EA58 /* WebKit.framework */; };
16-
AA56E9702321F67C002BB5E1 /* globals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA56E96F2321F67C002BB5E1 /* globals.cpp */; };
17-
AA56E98A2321F67E002BB5E1 /* globals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA56E96F2321F67C002BB5E1 /* globals.cpp */; };
1816
AA9F4B912321BEE900FF2E24 /* interface_derived.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA9F4B8F2321BEE900FF2E24 /* interface_derived.cpp */; };
1917
AA9F4B922321BEE900FF2E24 /* interface_derived.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA9F4B8F2321BEE900FF2E24 /* interface_derived.cpp */; };
2018
AAA0F59B23667BCA00B8E4A7 /* open_with_dlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAA0F59A23667BCA00B8E4A7 /* open_with_dlg.cpp */; };
@@ -244,11 +242,11 @@
244242
AA1D0FCA222A0A4B00678304 /* wxcocoa.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxcocoa.xcconfig; path = wxWidgets/build/osx/wxcocoa.xcconfig; sourceTree = SOURCE_ROOT; };
245243
AA1D0FCB222A0A4B00678304 /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxdebug.xcconfig; path = wxWidgets/build/osx/wxdebug.xcconfig; sourceTree = SOURCE_ROOT; };
246244
AA256DC72367942600F9EA58 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
247-
AA56E96F2321F67C002BB5E1 /* globals.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = globals.cpp; sourceTree = "<group>"; };
248245
AA9F4B8F2321BEE900FF2E24 /* interface_derived.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = interface_derived.cpp; sourceTree = "<group>"; };
249246
AA9F4B902321BEE900FF2E24 /* interface_derived.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = interface_derived.hpp; sourceTree = "<group>"; };
250247
AAA0F59A23667BCA00B8E4A7 /* open_with_dlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = open_with_dlg.cpp; sourceTree = "<group>"; };
251248
AAB4B99E23233EB5007D21F9 /* create_dialog_derived.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = create_dialog_derived.cpp; sourceTree = "<group>"; };
249+
AAB4C0922404AC7A00CF0C2F /* globals.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = globals.h; sourceTree = "<group>"; };
252250
AAD015CD222B2FE300E25CB7 /* Unity Hub Native.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Unity Hub Native.app"; sourceTree = BUILT_PRODUCTS_DIR; };
253251
AADF6A0B222B359700991DD2 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
254252
AADF6A26222B35B300991DD2 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -329,10 +327,10 @@
329327
AA1D0F50222A09A600678304 /* source */ = {
330328
isa = PBXGroup;
331329
children = (
330+
AAB4C0922404AC7A00CF0C2F /* globals.h */,
332331
AA012113224C24D4000F4F82 /* wxmac.icns */,
333332
AAF9D87A222B14E900437548 /* Info_cocoa.plist */,
334333
AAF9D87B222B14E900437548 /* main.cpp */,
335-
AA56E96F2321F67C002BB5E1 /* globals.cpp */,
336334
AA9F4B8F2321BEE900FF2E24 /* interface_derived.cpp */,
337335
AA9F4B902321BEE900FF2E24 /* interface_derived.hpp */,
338336
AAA0F59A23667BCA00B8E4A7 /* open_with_dlg.cpp */,
@@ -659,7 +657,6 @@
659657
isa = PBXSourcesBuildPhase;
660658
buildActionMask = 2147483647;
661659
files = (
662-
AA56E9702321F67C002BB5E1 /* globals.cpp in Sources */,
663660
AA9F4B912321BEE900FF2E24 /* interface_derived.cpp in Sources */,
664661
AAB4B99F23233EB5007D21F9 /* create_dialog_derived.cpp in Sources */,
665662
AAF9D87D222B14E900437548 /* main.cpp in Sources */,
@@ -672,7 +669,6 @@
672669
isa = PBXSourcesBuildPhase;
673670
buildActionMask = 2147483647;
674671
files = (
675-
AA56E98A2321F67E002BB5E1 /* globals.cpp in Sources */,
676672
AA9F4B922321BEE900FF2E24 /* interface_derived.cpp in Sources */,
677673
AAB4B9A023233EB5007D21F9 /* create_dialog_derived.cpp in Sources */,
678674
AAD015C0222B2FE300E25CB7 /* main.cpp in Sources */,
@@ -833,13 +829,13 @@
833829
CODE_SIGN_IDENTITY = "-";
834830
CODE_SIGN_STYLE = Automatic;
835831
COMBINE_HIDPI_IMAGES = YES;
836-
CURRENT_PROJECT_VERSION = 1.3;
832+
CURRENT_PROJECT_VERSION = 1.35;
837833
INFOPLIST_FILE = "$(SRCROOT)/source/Info_cocoa.plist";
838834
LD_RUNPATH_SEARCH_PATHS = (
839835
"$(inherited)",
840836
"@executable_path/../Frameworks",
841837
);
842-
MARKETING_VERSION = 1.3;
838+
MARKETING_VERSION = 1.35;
843839
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
844840
PRODUCT_BUNDLE_IDENTIFIER = com.ravbug.UnityHubNativeDynamic;
845841
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -852,13 +848,13 @@
852848
CODE_SIGN_IDENTITY = "-";
853849
CODE_SIGN_STYLE = Automatic;
854850
COMBINE_HIDPI_IMAGES = YES;
855-
CURRENT_PROJECT_VERSION = 1.3;
851+
CURRENT_PROJECT_VERSION = 1.35;
856852
INFOPLIST_FILE = "$(SRCROOT)/source/Info_cocoa.plist";
857853
LD_RUNPATH_SEARCH_PATHS = (
858854
"$(inherited)",
859855
"@executable_path/../Frameworks",
860856
);
861-
MARKETING_VERSION = 1.3;
857+
MARKETING_VERSION = 1.35;
862858
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
863859
PRODUCT_BUNDLE_IDENTIFIER = com.ravbug.UnityHubNativeDynamic;
864860
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -871,7 +867,7 @@
871867
CODE_SIGN_IDENTITY = "-";
872868
CODE_SIGN_STYLE = Automatic;
873869
COMBINE_HIDPI_IMAGES = YES;
874-
CURRENT_PROJECT_VERSION = 1.3;
870+
CURRENT_PROJECT_VERSION = 1.35;
875871
HEADER_SEARCH_PATHS = (
876872
"\"$(WXROOT)/include\"",
877873
"\"$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include\"",
@@ -890,7 +886,7 @@
890886
"$(inherited)",
891887
"@executable_path/../Frameworks",
892888
);
893-
MARKETING_VERSION = 1.3;
889+
MARKETING_VERSION = 1.35;
894890
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
895891
PRODUCT_BUNDLE_IDENTIFIER = com.ravbug.UnityHubNative;
896892
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -903,7 +899,7 @@
903899
CODE_SIGN_IDENTITY = "-";
904900
CODE_SIGN_STYLE = Automatic;
905901
COMBINE_HIDPI_IMAGES = YES;
906-
CURRENT_PROJECT_VERSION = 1.3;
902+
CURRENT_PROJECT_VERSION = 1.35;
907903
HEADER_SEARCH_PATHS = (
908904
"\"$(WXROOT)/include\"",
909905
"\"$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include\"",
@@ -922,7 +918,7 @@
922918
"$(inherited)",
923919
"@executable_path/../Frameworks",
924920
);
925-
MARKETING_VERSION = 1.3;
921+
MARKETING_VERSION = 1.35;
926922
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
927923
PRODUCT_BUNDLE_IDENTIFIER = com.ravbug.UnityHubNative;
928924
PRODUCT_NAME = "$(TARGET_NAME)";

‎source/interface_derived.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ MainFrameDerived::MainFrameDerived() : MainFrame(NULL){
8484
}
8585
//if no projects to load, the interface will be blank
8686

87-
#if defined __APPLE || defined _WIN32
87+
#if defined __APPLE__ || defined _WIN32
8888
timeout = new wxTimer(this, TIMER);
8989

9090
#elif defined __linux__

0 commit comments

Comments
 (0)