Merge pull request #351 from in1tiate/in1tiate/sane-libs
Search for libraries inside a dedicated "lib" folder (and notes on distributing future releases)
This commit is contained in:
		
						commit
						9cd533cf40
					
				@ -14,6 +14,7 @@ SOURCES += $$files($$PWD/src/*.cpp)
 | 
				
			|||||||
HEADERS += $$files($$PWD/include/*.h)
 | 
					HEADERS += $$files($$PWD/include/*.h)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
LIBS += -L$$PWD/lib
 | 
					LIBS += -L$$PWD/lib
 | 
				
			||||||
 | 
					QMAKE_LFLAGS += -Wl,-rpath,"'\$$ORIGIN/lib'"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Uncomment for verbose network logging
 | 
					# Uncomment for verbose network logging
 | 
				
			||||||
# DEFINES += DEBUG_NETWORK
 | 
					# DEFINES += DEBUG_NETWORK
 | 
				
			||||||
 | 
				
			|||||||
@ -21,6 +21,8 @@ int main(int argc, char *argv[])
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  AOApplication main_app(argc, argv);
 | 
					  AOApplication main_app(argc, argv);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  AOApplication::addLibraryPath(AOApplication::applicationDirPath() + "/lib");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  QSettings *configini = main_app.configini;
 | 
					  QSettings *configini = main_app.configini;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  QPluginLoader apngPlugin("qapng");
 | 
					  QPluginLoader apngPlugin("qapng");
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user