equal
deleted
inserted
replaced
169 ${QT_LIBRARIES} |
169 ${QT_LIBRARIES} |
170 ${SDL_LIBRARY} |
170 ${SDL_LIBRARY} |
171 openalbridge |
171 openalbridge |
172 ) |
172 ) |
173 |
173 |
174 #since openalbridge is linked statically with non-m$ compilers we need to explicitly link dependencies |
174 #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 #moreover in windows they need to be compiled in a particular order |
175 if(NOT WIN32 AND NOT APPLE) |
176 if(NOT MSVC AND NOT APPLE) |
|
177 set(HW_LINK_LIBS |
176 set(HW_LINK_LIBS |
|
177 ${HW_LINK_LIBS} |
178 ${OPENAL_LIBRARY} |
178 ${OPENAL_LIBRARY} |
|
179 ${OGG_LIBRARY} |
179 ${VORBIS_LIBRARY} |
180 ${VORBIS_LIBRARY} |
180 ${VORBISFILE_LIBRARY} |
181 ${VORBISFILE_LIBRARY} |
181 ${OGG_LIBRARY} |
|
182 ${HW_LINK_LIBS} |
|
183 ) |
182 ) |
184 endif(NOT MSVC AND NOT APPLE) |
183 endif() |
185 #no vorbisfile required here |
184 #no vorbisfile required for MacOS X |
186 if(APPLE) |
185 if(APPLE) |
187 set(HW_LINK_LIBS |
186 set(HW_LINK_LIBS |
188 ${OPENAL_LIBRARY} |
187 ${OPENAL_LIBRARY} |
|
188 ${OGG_LIBRARY} |
189 ${VORBIS_LIBRARY} |
189 ${VORBIS_LIBRARY} |
190 ${OGG_LIBRARY} |
|
191 ${HW_LINK_LIBS} |
190 ${HW_LINK_LIBS} |
192 ) |
191 ) |
193 endif(APPLE) |
192 endif(APPLE) |
194 |
193 |
195 |
194 |