atria-tools/lutin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some correction

Browse Source
This commit is contained in:
Edouard Dupin 2012-09-14 17:19:17 +02:00
parent e94373db6a
commit a42715960b
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.Android.mk
View File

@ -11,11 +11,11 @@ TARGET_GLOBAL_LDLIBS_SHARED = --sysroot=$(PROJECT_NDK)/platforms/android-$(ANDRO
#generic makefile #generic makefile
include $(EWOL_FOLDER)/Build/core/main.mk include $(EWOL_FOLDER)/Build/core/main.mk
CONFIG2___EWOL_APPL_ORGANISATION_TYPE__ := $(call convert-special-char,$(CONFIG___EWOL_APPL_ORGANISATION_TYPE__)) CONFIG2___EWOL_APPL_ORGANISATION_TYPE__ := $(subst _,$(empty),$(call convert-special-char,$(CONFIG___EWOL_APPL_ORGANISATION_TYPE__)))
CONFIG2___EWOL_APPL_COMPAGNY__ := $(call convert-special-char,$(CONFIG___EWOL_APPL_COMPAGNY__)) CONFIG2___EWOL_APPL_COMPAGNY__ := $(subst _,$(empty),$(call convert-special-char,$(CONFIG___EWOL_APPL_COMPAGNY__)))
CONFIG2___EWOL_APPL_NAME__ := $(call convert-special-char,$(CONFIG___EWOL_APPL_NAME__)) CONFIG2___EWOL_APPL_NAME__ := $(subst _,$(empty),$(call convert-special-char,$(CONFIG___EWOL_APPL_NAME__)))
CONFIG2___EWOL_ANDROID_ICON__ := $(subst $(quote),$(empty),$(CONFIG___EWOL_ANDROID_ICON__)) CONFIG2___EWOL_ANDROID_ICON__ := $(subst $(quote),$(empty),$(CONFIG___EWOL_ANDROID_ICON__))
@ -56,10 +56,8 @@ $(FINAL_FOLDER_JAVA)/AndroidManifest.xml : $(CONFIG_GLOBAL_FILE)
@echo " android:versionCode=\"1\" " >> $@ @echo " android:versionCode=\"1\" " >> $@
@echo " android:versionName=\"$(APPL_VERSION)\"> " >> $@ @echo " android:versionName=\"$(APPL_VERSION)\"> " >> $@
ifeq ("$(CONFIG___VIDEO__OPENGL_ES_2)","y") ifeq ("$(CONFIG___VIDEO__OPENGL_ES_2)","y")
@echo " <!-- Use openGl ES 2 --> " >> $@
@echo " <uses-feature android:glEsVersion=\"0x00020000\" android:required=\"true\" />" >> $@ @echo " <uses-feature android:glEsVersion=\"0x00020000\" android:required=\"true\" />" >> $@
endif endif
@echo " <!-- This is the platform API where NativeActivity was introduced. --> " >> $@
@echo " <uses-sdk android:minSdkVersion=\"$(CONFIG___EWOL_ANDROID_MINIMUM_SDK_VERSION__)\" /> " >> $@ @echo " <uses-sdk android:minSdkVersion=\"$(CONFIG___EWOL_ANDROID_MINIMUM_SDK_VERSION__)\" /> " >> $@
@echo " " >> $@ @echo " " >> $@
@echo " <application android:label=\"$(CONFIG___EWOL_APPL_NAME__)\" " >> $@ @echo " <application android:label=\"$(CONFIG___EWOL_APPL_NAME__)\" " >> $@

1
core/config.mk
View File

@ -175,7 +175,6 @@ define generate-autoconf-file
-e 's/^\#\(.*\)/\/*\1 *\//' \ -e 's/^\#\(.*\)/\/*\1 *\//' \
-e 's/\(.*\)=\(.*\)/\#define \1 \2/' \ -e 's/\(.*\)=\(.*\)/\#define \1 \2/' \
-e 's/ y$$/ 1/' \ -e 's/ y$$/ 1/' \
-e 's/\"\(.*\)\"/\1/' \
-e 's/\\\"/\"/g' \ -e 's/\\\"/\"/g' \
$1 > $2; $1 > $2;
endef endef