mcst-linux-kernel/patches-2024.06.26/Native_SDK-4.1/0002_compile_without_some_o...

78 lines
3.5 KiB
Diff
Raw Permalink Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

diff -ruaN Native_SDK-4.1/Builds/Linux/make_example.mak my_Native_SDK-4.1/Builds/Linux/make_example.mak
--- Native_SDK-4.1/Builds/Linux/make_example.mak 2016-06-08 16:35:32.000000000 +0300
+++ my_Native_SDK-4.1/Builds/Linux/make_example.mak 2024-04-24 17:36:35.205723984 +0300
@@ -45,6 +45,7 @@
$(call message, Linking Application: Binary is $(PLAT_OBJPATH)/$(OUTNAME))
@mkdir -p $(@D)
$(PLAT_CPP) -o $@ $(OBJECTS_PREFIXED) -Wl,--start-group $(LINK) -Wl,--end-group $(PLAT_LINK)
+ @echo "Link the final binary"
#--------------COMPILE SOURCE FILES--------------
$(PLAT_OBJPATH)/BuildTemp/%.o: %.c
@@ -52,23 +53,28 @@
# http://stackoverflow.com/questions/97338/gcc-dependency-generation-for-a-different-output-directory
# combined with "Tromey's Way" from 'Managing Projects with GNU Make'
@mkdir -p $(@D)
- $(PLAT_CC) $(PLAT_CFLAGS) $(INCLUDES) -MF"$(@:.o=.d)" -MG -MM -MP -MT"$(@:.o=.d)" -MT"$@" "$<"
+ $(PLAT_CC) $(PLAT_CFLAGS) $(INCLUDES) -MF"$(@:.o=.d)" -MM -MP -MT"$(@:.o=.d)" -MT"$@" "$<"
$(PLAT_CC) -c $(PLAT_CFLAGS) $(INCLUDES) $< -o$@
+ @echo "compile sourse files.c"
$(PLAT_OBJPATH)/BuildTemp/%.o: %.cpp
@mkdir -p $(@D)
- $(PLAT_CPP) $(PLAT_CPPFLAGS) $(PLAT_CFLAGS) $(INCLUDES) -MF"$(@:.o=.d)" -MG -MM -MP -MT"$(@:.o=.d)" -MT"$@" "$<"
+ $(PLAT_CPP) $(PLAT_CPPFLAGS) $(PLAT_CFLAGS) $(INCLUDES) -MF"$(@:.o=.d)" -MM -MP -MT"$(@:.o=.d)" -MT"$@" "$<"
+
$(PLAT_CPP) -c $(PLAT_CPPFLAGS) $(PLAT_CFLAGS) $(INCLUDES) $< -o$@
+ @echo "compile sourse files.cpp"
#--------------COPY THE GENERIC ASSETS THAT ARE FOUND IN THE COMMON FOLDER "PROCESSASSETS"--------------
$(PLAT_OBJPATH)/Assets/%: $(abspath $(PLAT_OBJPATH)/../../../../ProcessedAssets)/%
@mkdir -p $(@D)
cp -f $(abspath $<) $(abspath $@)
+ @echo "end of copy assets (ProcessedAssets)"
#--------------COPY THE ASSETS THAT ARE FOUND IN THE PER-API FOLDER--------------
$(PLAT_OBJPATH)/Assets/%: $(abspath $(PLAT_OBJPATH)/../../..)/%
@mkdir -p $(@D)
cp -f $(abspath $<) $(abspath $@)
+ @echo "end of copy assets (per-api)"
print_info:
@echo ""
diff -ruaN Native_SDK-4.1/Builds/Linux/make_framework.mak my_Native_SDK-4.1/Builds/Linux/make_framework.mak
--- Native_SDK-4.1/Builds/Linux/make_framework.mak 2016-06-08 16:35:32.000000000 +0300
+++ my_Native_SDK-4.1/Builds/Linux/make_framework.mak 2024-04-24 17:36:57.282253926 +0300
@@ -57,7 +57,7 @@
$(PLAT_OBJPATH)/BuildTemp/%.o: %.cpp
@mkdir -p $(@D)
- $(PLAT_CPP) $(PLAT_CPPFLAGS) $(PLAT_CFLAGS) $(INCLUDES) -MF"$(@:.o=.d)" -MG -MM -MP -MT"$(@:.o=.d)" -MT"$@" "$<"
+ $(PLAT_CPP) $(PLAT_CPPFLAGS) $(PLAT_CFLAGS) $(INCLUDES) -MF"$(@:.o=.d)" -MM -MP -MT"$(@:.o=.d)" -MT"$@" "$<"
$(PLAT_CPP) -c $(PLAT_CPPFLAGS) $(PLAT_CFLAGS) $(INCLUDES) $< -o$@
clean:
@@ -66,4 +66,4 @@
ifneq "$(MAKECMDGOALS)" "clean"
sinclude $(SOURCE_DEPENDENCIES)
-endif
\ В конце файла нет новой строки
+endif
diff -ruaN Native_SDK-4.1/Builds/Linux/platform.mak my_Native_SDK-4.1/Builds/Linux/platform.mak
--- Native_SDK-4.1/Builds/Linux/platform.mak 2016-06-08 16:35:32.000000000 +0300
+++ my_Native_SDK-4.1/Builds/Linux/platform.mak 2024-04-24 17:33:13.500885171 +0300
@@ -28,8 +28,11 @@
API_INC ?= $(APIS)
#enable C++11 if available
+ifeq "$(MAKE_WITHOUT_CPP11)" "true"
+GCC_CPP11 = 0
+else
GCC_CPP11 = $(shell OUTPUT=`$(PLAT_CPP) -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'`;if [ $$OUTPUT -gt 40600 ];then echo 1;else echo 0;fi;)
-
+endif
PLAT_CPPFLAGS += -Wno-deprecated-declarations
ifeq "$(GCC_CPP11)" "1"