updates an incorrect path name in the project configuration, the --debug option now utilizes the qmake debug release option
git-svn-id: svn://svn.code.sf.net/p/qjoypad/code/trunk@124 c05e91a0-76c8-4ec0-b377-ef19ce7cc080
This commit is contained in:
		
				
					committed by
					
						
						virtuoussin13
					
				
			
			
				
	
			
			
			
						parent
						
							03f4297446
						
					
				
				
					commit
					030bc594ab
				
			
							
								
								
									
										10
									
								
								src/config
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								src/config
									
									
									
									
									
								
							@@ -31,6 +31,7 @@ prefix="/usr/local"
 | 
			
		||||
installdir="";
 | 
			
		||||
plain_keys=""
 | 
			
		||||
debug_option="";
 | 
			
		||||
build_mode="release";
 | 
			
		||||
for arg in $*
 | 
			
		||||
do
 | 
			
		||||
	case $arg in
 | 
			
		||||
@@ -78,7 +79,8 @@ Options:
 | 
			
		||||
            fi;;
 | 
			
		||||
		--plain_keys) plain_keys="PLAIN_KEYS";;
 | 
			
		||||
        --debug)
 | 
			
		||||
            debug_option+="_DEBUG";;
 | 
			
		||||
            debug_option+="_DEBUG";
 | 
			
		||||
            build_mode="debug";;
 | 
			
		||||
        *)  echo "Unrecognized argument: \"$arg\". Try ./config --help for help."
 | 
			
		||||
	esac
 | 
			
		||||
done
 | 
			
		||||
@@ -88,7 +90,11 @@ arg2="PREFIX=$prefix"
 | 
			
		||||
arg3="DEFINES += $plain_keys $debug_option"
 | 
			
		||||
arg4="INSTALL_PREFIX=${installdir}/${prefix}/"
 | 
			
		||||
 | 
			
		||||
$QMAKE_EXEC -makefile "$arg1" "$arg2" "$arg3" "$arg4" qjoypad.pro
 | 
			
		||||
$QMAKE_EXEC -makefile DEVDIR=$devdir PREFIX=$prefix \
 | 
			
		||||
    "DEFINES += $plain_keys $debug_option" \
 | 
			
		||||
    INSTALL_PREFIX=${installdir}/${prefix}/ \
 | 
			
		||||
    "CONFIG += $build_mode" \
 | 
			
		||||
    qjoypad.pro
 | 
			
		||||
 | 
			
		||||
echo "
 | 
			
		||||
Configuring QJoyPad installation...
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ icons.path = $$INSTALL_PREFIX/share/pixmaps/qjoypad
 | 
			
		||||
icons.conf_path = $$PREFIX/share/pixmaps/qjoypad
 | 
			
		||||
icons.extra = cp ../icons/* $${icons.path}; cd $${icons.path}; ln -sf gamepad4-24x24.png icon24.png; ln -sf gamepad3-64x64.png icon64.png; chmod -R a+r $${icons.path}
 | 
			
		||||
 | 
			
		||||
doc.path = $$INSTALL_PREFIX/share/doc/qjoypad3
 | 
			
		||||
doc.path = $$INSTALL_PREFIX/share/doc/qjoypad4
 | 
			
		||||
doc.extra = cp ../README.txt ../LICENSE.txt $${doc.path}
 | 
			
		||||
target.path = $$INSTALL_PREFIX/bin
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user