In this thesis, a two-machine flow-shop scheduling problem with two kinds(renewable and non-renewable) of additional resources is considered. The objective of the problem is to determine the sequence of jobs on each machine and the amount of resources to be allotted for each operation in order to minimize the makespan. It is assumed that the processing time of each operation is a linearly decreasing function about allotted amounts of renewable and non-renewable resources. And the amount of each type of resource is restricted to an upper limit. Some dominance properties are characterized for the our problem, based upon which a branch and bound algorithm is exploited to find the optimum. Heuristic algorithms are also proposed and some computational experiences are discussed.