mirror of
				https://github.com/PurpleI2P/i2pd.git
				synced 2025-11-04 08:30:46 +00:00 
			
		
		
		
	various + fixed #519
This commit is contained in:
		
							parent
							
								
									bd092295a4
								
							
						
					
					
						commit
						51519361e2
					
				
					 3 changed files with 11 additions and 20 deletions
				
			
		
							
								
								
									
										4
									
								
								qt/.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								qt/.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -1,3 +1 @@
 | 
				
			||||||
/build-i2pd_qt-Android_armeabi_v7a_GCC_4_9_Qt_5_6_0-Debug/
 | 
					/build*/
 | 
				
			||||||
/build-i2pd_qt-Desktop_Qt_5_6_0_GCC_64bit-Debug/
 | 
					 | 
				
			||||||
/build-i2pd_qt-Android_x86_GCC_4_9_Qt_5_6_0-Debug/
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,22 +1,11 @@
 | 
				
			||||||
<?xml version="1.0"?>
 | 
					<?xml version="1.0"?>
 | 
				
			||||||
<manifest 
 | 
					<manifest package="org.purplei2p.i2pd" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.8.0" android:versionCode="1" android:installLocation="auto">
 | 
				
			||||||
    package="org.purplei2p.i2pd" 
 | 
					 | 
				
			||||||
    xmlns:android="http://schemas.android.com/apk/res/android" 
 | 
					 | 
				
			||||||
    android:versionName="2.8.0" android:versionCode="1" android:installLocation="auto">
 | 
					 | 
				
			||||||
    <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="24"/>
 | 
					    <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="24"/>
 | 
				
			||||||
	<supports-screens 
 | 
					        <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 | 
				
			||||||
	    android:largeScreens="true" 
 | 
					    <!-- <application android:hardwareAccelerated="true" -->
 | 
				
			||||||
	    android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 | 
					        <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="i2pd">
 | 
				
			||||||
    <!-- <application android:hardwareAccelerated="true" --> 
 | 
					 | 
				
			||||||
	<application 
 | 
					 | 
				
			||||||
        android:name="org.qtproject.qt5.android.bindings.QtApplication" 
 | 
					 | 
				
			||||||
        android:label="i2pd">
 | 
					 | 
				
			||||||
        <!-- android:configChanges="screenSize|smallestScreenSize" are since api 13, "layoutDirection" since api 17 -->
 | 
					        <!-- android:configChanges="screenSize|smallestScreenSize" are since api 13, "layoutDirection" since api 17 -->
 | 
				
			||||||
        <activity 
 | 
					        <activity android:configChanges="orientation|uiMode|screenLayout|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.purplei2p.i2pd.I2PDMainActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
 | 
				
			||||||
            android:configChanges="orientation|uiMode|screenLayout|locale|fontScale|keyboard|keyboardHidden|navigation" 
 | 
					 | 
				
			||||||
            android:name="org.purplei2p.i2pd.I2PDMainActivity" 
 | 
					 | 
				
			||||||
            android:label="-- %%INSERT_APP_NAME%% --" 
 | 
					 | 
				
			||||||
            android:screenOrientation="unspecified" android:launchMode="singleTop">
 | 
					 | 
				
			||||||
            <intent-filter>
 | 
					            <intent-filter>
 | 
				
			||||||
                <action android:name="android.intent.action.MAIN"/>
 | 
					                <action android:name="android.intent.action.MAIN"/>
 | 
				
			||||||
                <category android:name="android.intent.category.LAUNCHER"/>
 | 
					                <category android:name="android.intent.category.LAUNCHER"/>
 | 
				
			||||||
| 
						 | 
					@ -60,7 +49,7 @@
 | 
				
			||||||
            <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
 | 
					            <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
 | 
				
			||||||
            <!-- auto screen scale factor -->
 | 
					            <!-- auto screen scale factor -->
 | 
				
			||||||
        </activity>
 | 
					        </activity>
 | 
				
			||||||
        <service android:enabled="true" android:name=".LocalService" />
 | 
					        <service android:enabled="true" android:name=".LocalService"/>
 | 
				
			||||||
    </application>
 | 
					    </application>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
 | 
					    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -137,6 +137,7 @@ LIBS += -lz
 | 
				
			||||||
android {
 | 
					android {
 | 
				
			||||||
message("Using Android settings")
 | 
					message("Using Android settings")
 | 
				
			||||||
DEFINES += ANDROID=1
 | 
					DEFINES += ANDROID=1
 | 
				
			||||||
 | 
					DEFINES += __ANDROID__
 | 
				
			||||||
INCLUDEPATH +=  $$BOOST_PATH/boost_1_53_0/include \
 | 
					INCLUDEPATH +=  $$BOOST_PATH/boost_1_53_0/include \
 | 
				
			||||||
                $$OPENSSL_PATH/openssl-1.0.2/include \
 | 
					                $$OPENSSL_PATH/openssl-1.0.2/include \
 | 
				
			||||||
                $$IFADDRS_PATH
 | 
					                $$IFADDRS_PATH
 | 
				
			||||||
| 
						 | 
					@ -146,6 +147,9 @@ DISTFILES += \
 | 
				
			||||||
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 | 
					ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 | 
				
			||||||
 | 
					
 | 
				
			||||||
equals(ANDROID_TARGET_ARCH, armeabi-v7a){
 | 
					equals(ANDROID_TARGET_ARCH, armeabi-v7a){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DEFINES += ANDROID_ARM7A
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# http://stackoverflow.com/a/30235934/529442
 | 
					# http://stackoverflow.com/a/30235934/529442
 | 
				
			||||||
LIBS += -L$$BOOST_PATH/boost_1_53_0/armeabi-v7a/lib \
 | 
					LIBS += -L$$BOOST_PATH/boost_1_53_0/armeabi-v7a/lib \
 | 
				
			||||||
-lboost_system-gcc-mt-1_53 \
 | 
					-lboost_system-gcc-mt-1_53 \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue