Was he joking or serious?

I have this friend ive known for about 7 months. Hes older than me...im 25, hes 43. Hes from morocco and has lived in the states for about 20 years. Hes a musician and a painter. Anywho...hes very philosophical and kinda sarcastic. I moved to France for the year a few months ago and we used to talk everyday. I kinda fell in love with him. I told him kinda indirectly and said he loved me too. It of course couldnt really work out for many reasons but we remain friends. I know were still like eachother. Anyways...we were on the phone today and we started talking about and how we both havent had it in awhile. I said im waiting until i get married or at least until im in a loving relationship. I happen to be coming to visit everyone in the US in Feb. After i said the no until married thing he said 'Dont show up on my doorstep!' I couldnt hear what he said after that but he said take it for what its worth. He said to be happy that he wants to be with me. Im upset.