equal
deleted
inserted
replaced
170 ${QT_LIBRARIES} |
170 ${QT_LIBRARIES} |
171 ${SDL_LIBRARY} |
171 ${SDL_LIBRARY} |
172 openalbridge |
172 openalbridge |
173 ) |
173 ) |
174 |
174 |
175 #openalbridge is linked statically in unix, dynamically in windows; for static we need to explicitly link dependencies -- if we ever change this remember that in windows library order counts |
175 #remember that in windows library order counts |
176 if(NOT WIN32 AND NOT APPLE) |
176 if(NOT APPLE) |
177 set(HW_LINK_LIBS |
177 set(HW_LINK_LIBS |
178 ${HW_LINK_LIBS} |
178 ${HW_LINK_LIBS} |
179 ${OPENAL_LIBRARY} |
179 ${OPENAL_LIBRARY} |
180 ${OGG_LIBRARY} |
180 ${OGG_LIBRARY} |
181 ${VORBIS_LIBRARY} |
181 ${VORBIS_LIBRARY} |
182 ${VORBISFILE_LIBRARY} |
182 ${VORBISFILE_LIBRARY} |
183 ) |
183 ) |
184 endif() |
184 else() |
185 #no vorbisfile required for MacOS X |
185 #no vorbisfile required for MacOS X |
186 if(APPLE) |
|
187 set(HW_LINK_LIBS |
186 set(HW_LINK_LIBS |
188 ${OPENAL_LIBRARY} |
187 ${OPENAL_LIBRARY} |
189 ${OGG_LIBRARY} |
188 ${OGG_LIBRARY} |
190 ${VORBIS_LIBRARY} |
189 ${VORBIS_LIBRARY} |
191 ${HW_LINK_LIBS} |
190 ${HW_LINK_LIBS} |
192 ${SPARKLE_LIBRARY} |
191 ${SPARKLE_LIBRARY} |
193 ) |
192 ) |
194 endif(APPLE) |
193 endif() |
195 |
194 |
196 |
195 |
197 if(WIN32 AND NOT UNIX) |
196 if(WIN32 AND NOT UNIX) |
198 if(NOT SDL_LIBRARY) |
197 if(NOT SDL_LIBRARY) |
199 set(HW_LINK_LIBS |
198 set(HW_LINK_LIBS |