update:compiler version

xengine-qyt · xengine-qyt · commit ce7c482c5fb2 · 2024-12-20T17:28:32.000+08:00
improved:make file
diff --git a/.github/workflows/macbuild.yml b/.github/workflows/macbuild.yml
@@ -2,7 +2,7 @@ name: macos build workflows
 
 on:
   push:
-    branches: [ "1" ]
+    branches: [ "master" ]
   
 permissions:
   contents: read
diff --git a/.github/workflows/ubuntubuild.yml b/.github/workflows/ubuntubuild.yml
@@ -2,7 +2,7 @@ name: ubuntu build workflows
 
 on:
   push:
-    branches: [ "1" ]
+    branches: [ "master" ]
   
 permissions:
   contents: read
diff --git a/XEngine_Source/XEngine_Depend b/XEngine_Source/XEngine_Depend
@@ -1 +1 @@
-Subproject commit ad2a0b8a8c487cc4aa1e5830141f024419f2d87f
+Subproject commit 60eac0753192a4a66fc90b561d8fde4e5282e2d9
diff --git a/XEngine_Source/XEngine_ModuleConfigure/Makefile b/XEngine_Source/XEngine_ModuleConfigure/Makefile
@@ -1,7 +1,6 @@
 CC = g++ -Wall -std=c++17 -fPIC
 PLATFORM = linux
 PLATVER = 
-PLATDIR = 
 FILEEXT = 
 LIBFLAG = 
 RELEASE = 0
@@ -34,10 +33,8 @@ endif
 ifeq ($(PLATFORM),linux)
 	ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
 		PLATVER = -D __CENTOS__
-		PLATDIR = XEngine_Linux/Centos
 	else
 		PLATVER = -D __UBUNTU__
-		PLATDIR = XEngine_Linux/Ubuntu
 	endif
 	FILEEXT = so
 	LIBFLAG = -shared
@@ -46,7 +43,6 @@ ifeq ($(PLATFORM),linux)
 else ifeq ($(PLATFORM),mac)
 	CC += -Wno-deprecated-declarations
 	PLATVER = -D __MACOS__
-	PLATDIR = XEngine_Mac
 	FILEEXT = dylib
 	LIBFLAG = -dynamiclib
 	LIBEX = -lpthread -ldl
diff --git a/XEngine_Source/XEngine_ModuleDatabase/Makefile b/XEngine_Source/XEngine_ModuleDatabase/Makefile
@@ -1,7 +1,6 @@
 CC = g++ -Wall -std=c++17 -fPIC
 PLATFORM = linux
 PLATVER = 
-PLATDIR = 
 FILEEXT = 
 LIBFLAG = 
 RELEASE = 0
@@ -34,10 +33,8 @@ endif
 ifeq ($(PLATFORM),linux)
 	ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
 		PLATVER = -D __CENTOS__
-		PLATDIR = XEngine_Linux/Centos
 	else
 		PLATVER = -D __UBUNTU__
-		PLATDIR = XEngine_Linux/Ubuntu
 	endif
 	FILEEXT = so
 	LIBFLAG = -shared
@@ -46,7 +43,6 @@ ifeq ($(PLATFORM),linux)
 else ifeq ($(PLATFORM),mac)
 	CC += -Wno-deprecated-declarations
 	PLATVER = -D __MACOS__
-	PLATDIR = XEngine_Mac
 	FILEEXT = dylib
 	LIBFLAG = -dynamiclib
 	LIBEX = -lpthread -ldl
diff --git a/XEngine_Source/XEngine_ModuleProtocol/Makefile b/XEngine_Source/XEngine_ModuleProtocol/Makefile
@@ -1,7 +1,6 @@
 CC = g++ -Wall -std=c++17 -fPIC
 PLATFORM = linux
 PLATVER = 
-PLATDIR = 
 FILEEXT = 
 LIBFLAG = 
 RELEASE = 0
@@ -34,10 +33,8 @@ endif
 ifeq ($(PLATFORM),linux)
 	ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
 		PLATVER = -D __CENTOS__
-		PLATDIR = XEngine_Linux/Centos
 	else
 		PLATVER = -D __UBUNTU__
-		PLATDIR = XEngine_Linux/Ubuntu
 	endif
 	FILEEXT = so
 	LIBFLAG = -shared
@@ -46,7 +43,6 @@ ifeq ($(PLATFORM),linux)
 else ifeq ($(PLATFORM),mac)
 	CC += -Wno-deprecated-declarations
 	PLATVER = -D __MACOS__
-	PLATDIR = XEngine_Mac
 	FILEEXT = dylib
 	LIBFLAG = -dynamiclib
 	LIBEX = -lpthread -ldl
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/Makefile b/XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/Makefile
@@ -1,7 +1,6 @@
 CC = g++ -Wall -std=c++17
 PLATFORM = linux
 PLATVER = 
-PLATDIR = 
 RELEASE = 0
 UNICODE = 0
 LOADHDR = -I ./
@@ -35,17 +34,14 @@ endif
 ifeq ($(PLATFORM),linux)
 	ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
 		PLATVER = -D __CENTOS__
-		PLATDIR = XEngine_Linux/Centos
 	else
 		PLATVER = -D __UBUNTU__
-		PLATDIR = XEngine_Linux/Ubuntu
 	endif
 	LIBEX = -lpthread -lrt -ldl
 	LOADBIN = -Wl,-rpath=./,--disable-new-dtags
 else ifeq ($(PLATFORM),mac)
 	CC += -Wno-deprecated-declarations
 	PLATVER = -D __MACOS__
-	PLATDIR = XEngine_Mac
 	LIBEX = -lpthread -ldl
 	LOADBIN = -Wl,-rpath,@loader_path/./
 endif
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/Makefile b/XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/Makefile
@@ -1,7 +1,6 @@
 CC = g++ -Wall -std=c++17
 PLATFORM = linux
 PLATVER = 
-PLATDIR = 
 RELEASE = 0
 UNICODE = 0
 LOADHDR = -I ./
@@ -35,17 +34,14 @@ endif
 ifeq ($(PLATFORM),linux)
 	ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
 		PLATVER = -D __CENTOS__
-		PLATDIR = XEngine_Linux/Centos
 	else
 		PLATVER = -D __UBUNTU__
-		PLATDIR = XEngine_Linux/Ubuntu
 	endif
 	LIBEX = -lpthread -lrt -ldl
 	LOADBIN = -Wl,-rpath=./,--disable-new-dtags
 else ifeq ($(PLATFORM),mac)
 	CC += -Wno-deprecated-declarations
 	PLATVER = -D __MACOS__
-	PLATDIR = XEngine_Mac
 	LIBEX = -lpthread -ldl
 	LOADBIN = -Wl,-rpath,@loader_path/./
 endif
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile
@@ -1,7 +1,6 @@
 CC = g++ -Wall -std=c++17
 PLATFORM = linux
 PLATVER = 
-PLATDIR = 
 RELEASE = 0
 UNICODE = 0
 LOADHDR = -I ./
@@ -35,17 +34,14 @@ endif
 ifeq ($(PLATFORM),linux)
 	ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
 		PLATVER = -D __CENTOS__
-		PLATDIR = XEngine_Linux/Centos
 	else
 		PLATVER = -D __UBUNTU__
-		PLATDIR = XEngine_Linux/Ubuntu
 	endif
 	LIBEX = -lpthread -lrt -ldl
 	LOADBIN = -Wl,-rpath=./,--disable-new-dtags
 else ifeq ($(PLATFORM),mac)
 	CC += -Wno-deprecated-declarations
 	PLATVER = -D __MACOS__
-	PLATDIR = XEngine_Mac
 	LIBEX = -lpthread -ldl
 	LOADBIN = -Wl,-rpath,@loader_path/./
 endif
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_SimpleApp/Makefile b/XEngine_Source/XEngine_ServiceApp/XEngine_SimpleApp/Makefile
@@ -1,7 +1,6 @@
 CC = g++ -Wall -std=c++17
 PLATFORM = linux
 PLATVER = 
-PLATDIR = 
 RELEASE = 0
 UNICODE = 0
 LOADHDR = -I ./
@@ -32,17 +31,14 @@ endif
 ifeq ($(PLATFORM),linux)
 	ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
 		PLATVER = -D __CENTOS__
-		PLATDIR = XEngine_Linux/Centos
 	else
 		PLATVER = -D __UBUNTU__
-		PLATDIR = XEngine_Linux/Ubuntu
 	endif
 	LIBEX = -lpthread -lrt -ldl
 	LOADBIN = -Wl,-rpath=./,--disable-new-dtags
 else ifeq ($(PLATFORM),mac)
 	CC += -Wno-deprecated-declarations
 	PLATVER = -D __MACOS__
-	PLATDIR = XEngine_Mac
 	LIBEX = -lpthread -ldl
 	LOADBIN = -Wl,-rpath,@loader_path/./
 endif
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_WebSocketApp/Makefile b/XEngine_Source/XEngine_ServiceApp/XEngine_WebSocketApp/Makefile
@@ -1,7 +1,6 @@
 CC = g++ -Wall -std=c++17
 PLATFORM = linux
 PLATVER = 
-PLATDIR = 
 RELEASE = 0
 UNICODE = 0
 LOADHDR = -I ./
@@ -35,17 +34,14 @@ endif
 ifeq ($(PLATFORM),linux)
 	ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
 		PLATVER = -D __CENTOS__
-		PLATDIR = XEngine_Linux/Centos
 	else
 		PLATVER = -D __UBUNTU__
-		PLATDIR = XEngine_Linux/Ubuntu
 	endif
 	LIBEX = -lpthread -lrt -ldl
 	LOADBIN = -Wl,-rpath=./,--disable-new-dtags
 else ifeq ($(PLATFORM),mac)
 	CC += -Wno-deprecated-declarations
 	PLATVER = -D __MACOS__
-	PLATDIR = XEngine_Mac
 	LIBEX = -lpthread -ldl
 	LOADBIN = -Wl,-rpath,@loader_path/./
 endif
