Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 3d41349

Browse files
livecodesebastienlivecodesebastien
committed
[[ RefactorServer ]] Mac and Linux updated
1 parent 0371d3c commit 3d41349

File tree

9 files changed

+400
-391
lines changed

9 files changed

+400
-391
lines changed

‎engine/Makefile.server‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ CUSTOM_INCLUDES=\
1919

2020
CUSTOM_DEPS=libkernel-server.a
2121

22-
CUSTOM_LIBS=pcre png jpeg z foundation gif graphics skia kernel-server openssl
22+
CUSTOM_LIBS=pcre png jpeg z foundation gif graphics skia kernel-server
2323
CUSTOM_STATIC_LIBS=curl ssl crypto rt icudata icui18n icuio icule iculx icuuc $(MODE_STATIC_LIBS)
2424
CUSTOM_DYNAMIC_LIBS=dl m pthread
2525

‎engine/engine.xcodeproj/project.pbxproj‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@
342342
4DB846D5192B558A00771914 /* libpcre.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D6C7999171348CD000BCF78 /* libpcre.a */; };
343343
4DB846D6192B558A00771914 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D6C7981171348A6000BCF78 /* libpng.a */; };
344344
4DB846D7192B558A00771914 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D6C7989171348B4000BCF78 /* libjpeg.a */; };
345-
4DB846D8192B558A00771914 /* libopenssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBF58631801CA57009CAB2E /* libopenssl.a */; };
346345
4DB846D9192B558A00771914 /* libskia.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 76F0CC9018CA28E500C01A67 /* libskia.a */; };
347346
4DB846DA192B559700771914 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D221A67171D574F00E7E557 /* libcrypto.dylib */; };
348347
4DB846DB192B559700771914 /* libcups.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D221A69171D574F00E7E557 /* libcups.dylib */; };
@@ -571,6 +570,7 @@
571570
A71F80540F4F178C003012FD /* Standalone.icns in Resources */ = {isa = PBXBuildFile; fileRef = A71F80530F4F178C003012FD /* Standalone.icns */; };
572571
A71F80550F4F17C1003012FD /* LiveCode.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D5885610B80DEAC00200116 /* LiveCode.icns */; };
573572
A71F80620F4F17F9003012FD /* StandaloneDoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = A71F80610F4F17F9003012FD /* StandaloneDoc.icns */; };
573+
BE0986A3194874DD0065CEEA /* revsecurity.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE0986A2194874DD0065CEEA /* revsecurity.dylib */; };
574574
BEA6F33419472695000D6A37 /* osxflst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D5880160B80A4F800200116 /* osxflst.cpp */; };
575575
BEF6186019470E1E00C42C57 /* exec-engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DE3B0F115888AB8008EB6B5 /* exec-engine.cpp */; };
576576
BEF6186119470E6100C42C57 /* exec-strings-chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76FA930917FC72FB003DB770 /* exec-strings-chunk.cpp */; };
@@ -968,6 +968,13 @@
968968
remoteGlobalIDString = D2AAC046055464E500DB518D;
969969
remoteInfo = libskia;
970970
};
971+
BE0986A0194872D20065CEEA /* PBXContainerItemProxy */ = {
972+
isa = PBXContainerItemProxy;
973+
containerPortal = 4DBF585D1801CA57009CAB2E /* libopenssl.xcodeproj */;
974+
proxyType = 1;
975+
remoteGlobalIDString = 4DBF57C01801A14C009CAB2E;
976+
remoteInfo = revsecurity;
977+
};
971978
BE3F705D175CD3E700DBFB07 /* PBXContainerItemProxy */ = {
972979
isa = PBXContainerItemProxy;
973980
containerPortal = 4D7FA7B61594E0FA00EEF440 /* libfoundation.xcodeproj */;
@@ -982,13 +989,6 @@
982989
remoteGlobalIDString = 4DF42A420B048617003F2D95;
983990
remoteInfo = foundation;
984991
};
985-
BEF618831947106500C42C57 /* PBXContainerItemProxy */ = {
986-
isa = PBXContainerItemProxy;
987-
containerPortal = 4DBF585D1801CA57009CAB2E /* libopenssl.xcodeproj */;
988-
proxyType = 1;
989-
remoteGlobalIDString = D2AAC045055464E500DB518D;
990-
remoteInfo = openssl;
991-
};
992992
/* End PBXContainerItemProxy section */
993993

994994
/* Begin PBXCopyFilesBuildPhase section */
@@ -1725,6 +1725,7 @@
17251725
A04643F60BAAA63A0030A830 /* w32theme.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = w32theme.cpp; path = src/w32theme.cpp; sourceTree = "<group>"; };
17261726
A71F80530F4F178C003012FD /* Standalone.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Standalone.icns; path = rsrc/Standalone.icns; sourceTree = "<group>"; };
17271727
A71F80610F4F17F9003012FD /* StandaloneDoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = StandaloneDoc.icns; path = rsrc/StandaloneDoc.icns; sourceTree = "<group>"; };
1728+
BE0986A2194874DD0065CEEA /* revsecurity.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = revsecurity.dylib; path = ../_build/mac/Debug/revsecurity.dylib; sourceTree = "<group>"; };
17281729
BE4D6171189A5495002DA467 /* AttachmentProvider.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; path = AttachmentProvider.java; sourceTree = "<group>"; };
17291730
BEF2C0EF17BA493A00E96459 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket.h; path = src/socket.h; sourceTree = "<group>"; };
17301731
BEF3110417C217C30073D70F /* dskw32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dskw32.cpp; path = src/dskw32.cpp; sourceTree = "<group>"; };
@@ -1872,6 +1873,7 @@
18721873
isa = PBXFrameworksBuildPhase;
18731874
buildActionMask = 2147483647;
18741875
files = (
1876+
BE0986A3194874DD0065CEEA /* revsecurity.dylib in Frameworks */,
18751877
BEF618A119471D4000C42C57 /* Carbon.framework in Frameworks */,
18761878
BEF6189619471C9700C42C57 /* Security.framework in Frameworks */,
18771879
BEF6189519471C6A00C42C57 /* IOKit.framework in Frameworks */,
@@ -1891,7 +1893,6 @@
18911893
4DB846D5192B558A00771914 /* libpcre.a in Frameworks */,
18921894
4DB846D6192B558A00771914 /* libpng.a in Frameworks */,
18931895
4DB846D7192B558A00771914 /* libjpeg.a in Frameworks */,
1894-
4DB846D8192B558A00771914 /* libopenssl.a in Frameworks */,
18951896
4DB846D9192B558A00771914 /* libskia.a in Frameworks */,
18961897
4DB846DE192B55AF00771914 /* CoreFoundation.framework in Frameworks */,
18971898
4DB847B8192B55C100771914 /* Cocoa.framework in Frameworks */,
@@ -1968,6 +1969,7 @@
19681969
4D587D920B80944100200116 = {
19691970
isa = PBXGroup;
19701971
children = (
1972+
BE0986A2194874DD0065CEEA /* revsecurity.dylib */,
19711973
BEF6189419471C6000C42C57 /* IOKit.framework */,
19721974
721CAAC218351E7400858545 /* libicudata.a */,
19731975
721CAAC318351E7400858545 /* libicuio.a */,
@@ -3100,8 +3102,8 @@
31003102
buildRules = (
31013103
);
31023104
dependencies = (
3103-
BEF618841947106500C42C57 /* PBXTargetDependency */,
31043105
4D222016171D730B00E7E557 /* PBXTargetDependency */,
3106+
BE0986A1194872D20065CEEA /* PBXTargetDependency */,
31053107
4D8D3567171D4B83009D9D25 /* PBXTargetDependency */,
31063108
4D8D3569171D4B83009D9D25 /* PBXTargetDependency */,
31073109
4D8D356B171D4B83009D9D25 /* PBXTargetDependency */,
@@ -4320,6 +4322,11 @@
43204322
name = libgraphics;
43214323
targetProxy = 76EF3184181E708A00FAC195 /* PBXContainerItemProxy */;
43224324
};
4325+
BE0986A1194872D20065CEEA /* PBXTargetDependency */ = {
4326+
isa = PBXTargetDependency;
4327+
name = revsecurity;
4328+
targetProxy = BE0986A0194872D20065CEEA /* PBXContainerItemProxy */;
4329+
};
43234330
BE3F705E175CD3E700DBFB07 /* PBXTargetDependency */ = {
43244331
isa = PBXTargetDependency;
43254332
name = foundation;
@@ -4330,11 +4337,6 @@
43304337
name = foundation;
43314338
targetProxy = BE3F705F175CD40000DBFB07 /* PBXContainerItemProxy */;
43324339
};
4333-
BEF618841947106500C42C57 /* PBXTargetDependency */ = {
4334-
isa = PBXTargetDependency;
4335-
name = openssl;
4336-
targetProxy = BEF618831947106500C42C57 /* PBXContainerItemProxy */;
4337-
};
43384340
/* End PBXTargetDependency section */
43394341

43404342
/* Begin XCBuildConfiguration section */
@@ -4511,6 +4513,7 @@
45114513
LIBRARY_SEARCH_PATHS = (
45124514
"$(inherited)",
45134515
"$(SOLUTION_DIR)/prebuilt/lib/mac",
4516+
"\"$(SRCROOT)/../_build/mac/Debug\"",
45144517
);
45154518
OTHER_LDFLAGS = "-ObjC";
45164519
PRODUCT_NAME = "Server-Community";
@@ -4524,6 +4527,7 @@
45244527
LIBRARY_SEARCH_PATHS = (
45254528
"$(inherited)",
45264529
"$(SOLUTION_DIR)/prebuilt/lib/mac",
4530+
"\"$(SRCROOT)/../_build/mac/Debug\"",
45274531
);
45284532
OTHER_LDFLAGS = "-ObjC";
45294533
PRODUCT_NAME = "Server-Community";

0 commit comments

Comments
 (0)