Skip to content

Commit e219e08

Browse files
committed
modify:depend library direction name
1 parent 580ac65 commit e219e08

File tree

13 files changed

+59
-59
lines changed

13 files changed

+59
-59
lines changed

.github/workflows/Rocky_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
uses: actions/checkout@v4
4747
with:
4848
repository: libxengine/XEngine_OPenSource
49-
path: XEngine_Source/XEngine_Depend
49+
path: XEngine_Source/XEngine_DependLibrary
5050

5151
- name: Set TERM variable
5252
run: echo "TERM=xterm" >> $GITHUB_ENV

.github/workflows/debian_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: actions/checkout@v4
4141
with:
4242
repository: libxengine/XEngine_OPenSource
43-
path: XEngine_Source/XEngine_Depend
43+
path: XEngine_Source/XEngine_DependLibrary
4444

4545
- name: Set TERM variable
4646
run: echo "TERM=xterm" >> $GITHUB_ENV

.github/workflows/fedora_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
uses: actions/checkout@v4
4747
with:
4848
repository: libxengine/XEngine_OPenSource
49-
path: XEngine_Source/XEngine_Depend
49+
path: XEngine_Source/XEngine_DependLibrary
5050

5151
- name: install system package
5252
run: |

.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/MQCore_ConfigModule/MQCore_ConfigModule.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,29 +99,29 @@
9999
<PropertyGroup Label="UserMacros" />
100100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
101101
<LinkIncremental>true</LinkIncremental>
102-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;..\MQCore_ConfigModule;$(IncludePath)</IncludePath>
102+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;..\MQCore_ConfigModule;$(IncludePath)</IncludePath>
103103
<LibraryPath>$(XEngine_Library);$(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_Library);$(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
</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
</PropertyGroup>
122122
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
123123
<LinkIncremental>false</LinkIncremental>
124-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
124+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
125125
</PropertyGroup>
126126
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
127127
<ClCompile>

XEngine_Source/MQCore_ConfigModule/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ CC = g++ -Wall -std=c++20 -fPIC
22
PLATVER =
33
FILEEXT =
44
LIBFLAG =
5-
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
6-
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
5+
LOADHDR = -I ./ -I ../XEngine_DependLibrary/XEngine_Module/jsoncpp
6+
LOADSO = -L ../XEngine_DependLibrary/XEngine_Module/jsoncpp
77
LIB = -ljsoncpp
88
LIBEX =
99
OBJECTS = Config_Json.o pch.o

XEngine_Source/MQCore_ProtocolModule/MQCore_ProtocolModule.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;..\MQCore_ProtocolModule;$(IncludePath)</IncludePath>
102+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;..\MQCore_ProtocolModule;$(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'">

XEngine_Source/MQCore_ProtocolModule/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ CC = g++ -Wall -std=c++20 -fPIC
22
PLATVER =
33
FILEEXT =
44
LIBFLAG =
5-
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
6-
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
5+
LOADHDR = -I ./ -I ../XEngine_DependLibrary/XEngine_Module/jsoncpp
6+
LOADSO = -L ../XEngine_DependLibrary/XEngine_Module/jsoncpp
77
LIB = -ljsoncpp -lXEngine_BaseLib -lXEngine_Cryption -lRfcComponents_MQTTProtocol
88
LIBEX =
99
OBJECTS = ProtocolModule_Packet.o ProtocolModule_Parse.o pch.o

XEngine_Source/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ UNICODE = 0
33
PLATFORM=linux
44
FLAGS=
55
#要编译的模块
6-
BASE_THIRDPART_JSONCPP = ./XEngine_Depend/XEngine_Module/jsoncpp
7-
BASE_THIRDPART_REPORT = ./XEngine_Depend/XEngine_Module/XEngine_InfoReport
8-
BASE_THIRDPART_TOKEN = ./XEngine_Depend/XEngine_Module/XEngine_Token
6+
BASE_THIRDPART_JSONCPP = ./XEngine_DependLibrary/XEngine_Module/jsoncpp
7+
BASE_THIRDPART_REPORT = ./XEngine_DependLibrary/XEngine_Module/XEngine_InfoReport
8+
BASE_THIRDPART_TOKEN = ./XEngine_DependLibrary/XEngine_Module/XEngine_Token
99

1010
BASE_CONFIG_PATH = ./MQCore_ConfigModule
1111
BASE_PROTOCOL_PATH = ./MQCore_ProtocolModule

0 commit comments

Comments
 (0)