Skip to content

Commit bf772ae

Browse files
xengine-qytxengine-qyt
committed
modify:depend library name
1 parent 391d976 commit bf772ae

File tree

6 files changed

+22
-21
lines changed

6 files changed

+22
-21
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "XEngine_Source/XEngine_Depend"]
2-
path = XEngine_Source/XEngine_Depend
2+
path = XEngine_Source/XEngine_DependLibrary
33
url = https://github.com/libxengine/XEngine_OPenSource.git

‎XEngine_Source/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ PLATFORM=linux
44
FLAGS =
55

66
#要编译的模块
7-
THIRDPART_MODULE_JSONCPP = ./XEngine_Depend/XEngine_Module/jsoncpp
8-
THIRDPART_MODULE_REPORT = ./XEngine_Depend/XEngine_Module/XEngine_InfoReport
7+
THIRDPART_MODULE_JSONCPP = ./XEngine_DependLibrary/XEngine_Module/jsoncpp
8+
THIRDPART_MODULE_REPORT = ./XEngine_DependLibrary/XEngine_Module/XEngine_InfoReport
99

1010
MODULE_CONFIGURE_PATH = ./XEngine_ModuleConfigure
1111
MODULE_DATABASE_PATH = ./XEngine_ModuleDatabase

‎XEngine_Source/XEngine.sln‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_HttpApp", "XEngine_
2121
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010} = {6C935BE1-77E3-4719-A7A6-C76ABAFEE010}
2222
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
2323
{F54F152C-594F-4465-A44E-2DB915B39760} = {F54F152C-594F-4465-A44E-2DB915B39760}
24+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89} = {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}
2425
EndProjectSection
2526
EndProject
2627
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_CenterApp", "XEngine_ServiceApp\XEngine_CenterApp\XEngine_CenterApp.vcxproj", "{20946145-EFE0-4B44-845C-031E487687ED}"
@@ -29,6 +30,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_CenterApp", "XEngin
2930
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010} = {6C935BE1-77E3-4719-A7A6-C76ABAFEE010}
3031
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
3132
{F54F152C-594F-4465-A44E-2DB915B39760} = {F54F152C-594F-4465-A44E-2DB915B39760}
33+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89} = {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}
3234
EndProjectSection
3335
EndProject
3436
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_ModuleProtocol", "XEngine_ModuleProtocol\XEngine_ModuleProtocol.vcxproj", "{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}"
@@ -44,6 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_HTTP2App", "XEngine
4446
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010} = {6C935BE1-77E3-4719-A7A6-C76ABAFEE010}
4547
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
4648
{F54F152C-594F-4465-A44E-2DB915B39760} = {F54F152C-594F-4465-A44E-2DB915B39760}
49+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89} = {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}
4750
EndProjectSection
4851
EndProject
4952
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_WebSocketApp", "XEngine_ServiceApp\XEngine_WebSocketApp\XEngine_WebSocketApp.vcxproj", "{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}"
@@ -52,6 +55,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_WebSocketApp", "XEn
5255
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010} = {6C935BE1-77E3-4719-A7A6-C76ABAFEE010}
5356
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
5457
{F54F152C-594F-4465-A44E-2DB915B39760} = {F54F152C-594F-4465-A44E-2DB915B39760}
58+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89} = {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}
5559
EndProjectSection
5660
EndProject
5761
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_SimpleApp", "XEngine_ServiceApp\XEngine_SimpleApp\XEngine_SimpleApp.vcxproj", "{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}"
@@ -62,14 +66,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_SimpleApp", "XEngin
6266
{F54F152C-594F-4465-A44E-2DB915B39760} = {F54F152C-594F-4465-A44E-2DB915B39760}
6367
EndProjectSection
6468
EndProject
65-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_Depend", "XEngine_Depend", "{B95BEA10-D69E-4BA1-BF80-D48855DEFC31}"
69+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_DependLibrary", "XEngine_DependLibrary", "{B95BEA10-D69E-4BA1-BF80-D48855DEFC31}"
6670
EndProject
67-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsoncpp", "XEngine_Depend\XEngine_Module\jsoncpp\jsoncpp.vcxproj", "{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}"
71+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsoncpp", "XEngine_DependLibrary\XEngine_Module\jsoncpp\jsoncpp.vcxproj", "{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}"
6872
EndProject
69-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_InfoReport", "XEngine_Depend\XEngine_Module\XEngine_InfoReport\XEngine_InfoReport.vcxproj", "{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}"
70-
ProjectSection(ProjectDependencies) = postProject
71-
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
72-
EndProjectSection
73+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_InfoReport", "XEngine_DependLibrary\XEngine_Module\XEngine_InfoReport\XEngine_InfoReport.vcxproj", "{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}"
7374
EndProject
7475
Global
7576
GlobalSection(SolutionConfigurationPlatforms) = preSolution

XEngine_Source/XEngine_Depend renamed to XEngine_Source/XEngine_DependLibrary

‎XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,30 +99,30 @@
9999
<PropertyGroup Label="UserMacros" />
100100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
101101
<LinkIncremental>true</LinkIncremental>
102-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;..\XEngine_ModuleConfigure;$(IncludePath)</IncludePath>
102+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;..\XEngine_ModuleConfigure;$(IncludePath)</IncludePath>
103103
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
104104
</PropertyGroup>
105105
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
106106
<LinkIncremental>false</LinkIncremental>
107-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
107+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
108108
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
109109
</PropertyGroup>
110110
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
111111
<LinkIncremental>true</LinkIncremental>
112-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;..\XEngine_ModuleConfigure;$(IncludePath)</IncludePath>
112+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;..\XEngine_ModuleConfigure;$(IncludePath)</IncludePath>
113113
</PropertyGroup>
114114
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
115115
<LinkIncremental>true</LinkIncremental>
116-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
116+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
117117
</PropertyGroup>
118118
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
119119
<LinkIncremental>false</LinkIncremental>
120-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
120+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
121121
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
122122
</PropertyGroup>
123123
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
124124
<LinkIncremental>false</LinkIncremental>
125-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
125+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
126126
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
127127
</PropertyGroup>
128128
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

‎XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,32 +99,32 @@
9999
<PropertyGroup Label="UserMacros" />
100100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
101101
<LinkIncremental>true</LinkIncremental>
102-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;..\XEngine_ModuleProtocol;$(IncludePath)</IncludePath>
102+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;..\XEngine_ModuleProtocol;$(IncludePath)</IncludePath>
103103
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
104104
</PropertyGroup>
105105
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
106106
<LinkIncremental>false</LinkIncremental>
107-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
107+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
108108
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
109109
</PropertyGroup>
110110
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
111111
<LinkIncremental>true</LinkIncremental>
112-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
112+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
113113
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
114114
</PropertyGroup>
115115
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
116116
<LinkIncremental>true</LinkIncremental>
117-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
117+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
118118
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
119119
</PropertyGroup>
120120
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
121121
<LinkIncremental>false</LinkIncremental>
122-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
122+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
123123
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
124124
</PropertyGroup>
125125
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
126126
<LinkIncremental>false</LinkIncremental>
127-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
127+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
128128
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
129129
</PropertyGroup>
130130
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

0 commit comments

Comments
 (0)