equal
deleted
inserted
replaced
200 case charSetNotSet: |
200 case charSetNotSet: |
201 default: |
201 default: |
202 conf.CharacterSet = "NotSet"; |
202 conf.CharacterSet = "NotSet"; |
203 break; |
203 break; |
204 } |
204 } |
205 conf.CharacterSet = charSet(temp.isEmpty() ? (short)charSetNotSet : temp.toShort()); |
|
206 } |
205 } |
207 conf.DeleteExtensionsOnClean = project->first("DeleteExtensionsOnClean"); |
206 conf.DeleteExtensionsOnClean = project->first("DeleteExtensionsOnClean"); |
208 conf.ImportLibrary = conf.linker.ImportLibrary; |
207 conf.ImportLibrary = conf.linker.ImportLibrary; |
209 conf.IntermediateDirectory = project->first("OBJECTS_DIR"); |
208 conf.IntermediateDirectory = project->first("OBJECTS_DIR"); |
210 //conf.OutputDirectory = "."; |
209 //conf.OutputDirectory = "."; |