Commit graph

45 commits

Author SHA1 Message Date
sezero
eafd77c770 revert r903 and the old conback hack commits. change the engine
to load id1/quakespasm.pak for content customizations.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@904 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-04-27 08:28:16 +00:00
sezero
a99bea5110 updated Xcode project file for fLaC music support, thanks to Kristian Duske.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@858 af15c1b1-3010-417e-b628-4374ebc0bcbd
2013-07-21 17:02:42 +00:00
sezero
c91aa79b99 merged the opus codec support patch
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@856 af15c1b1-3010-417e-b628-4374ebc0bcbd
2013-07-18 07:03:11 +00:00
sezero
a6832fd592 deleted QuakeSpasm_Prefix.pch, doesn't seem to be used.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@774 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-10-22 07:10:13 +00:00
sezero
9f2be3797d xcode project file update from Kristian.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@714 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-09-08 12:50:58 +00:00
sezero
bd16ddf798 added SDL_FRAMEWORK to GCC_PREPROCESSOR_DEFINITIONS in the Xcode project
file. further updating is still needed.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@700 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-08-16 05:15:52 +00:00
sezero
6c110e15a3 Updated support for building the OSX versions using Makefile.darwin. Do
not rely on sdl-config on OSX Framework builds, define new SDL_FRAMEWORK
and NO_SDL_CONFIG preprocessor macros to indicate that and include SDL.h
with the "SDL" subdirectory name included. Add new libmad and ogg/vorbis
headers and static and dynamic libraries for macosx. Xcode project files
need further updating.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@699 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-08-16 04:51:41 +00:00
kristianduske
c223b70393 Removed options for ppc64 because it cannot build anyway.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@630 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-02-10 20:41:31 +00:00
kristianduske
7f1f787d9b Fixed link to IOKit.framework in Xcode project.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@600 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-01-07 08:31:40 +00:00
kristianduske
cce245b688 Applied patch to disable mouse acceleration in Mac OS X.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@599 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-01-07 08:26:32 +00:00
kristianduske
57acc3b9da Removed Sparkle auto updates from OS X build and increased version numbers to 0.85.7.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@593 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-01-01 16:50:33 +00:00
kristianduske
319b2aed47 Updated version numbers to 0.85.6, updated sparkle files for 0.85.5, added some source files to Xcode project.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@562 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-27 17:18:28 +00:00
kristianduske
d74a39bf28 Changed version strings.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@553 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-26 22:42:21 +00:00
kristianduske
8be8eb975e Cleaned up some build settings and fixed a minor glitch in OS X launcher UI.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@552 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-26 22:27:18 +00:00
kristianduske
b4e6d07c7a Updated schemes for cross compilation from XCode 4.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@550 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-26 18:08:21 +00:00
sezero
5b180894a2 reverted parts of rev. 544 where an unintended Xcode update was performed
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@547 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-24 14:11:08 +00:00
sezero
c129bd7941 deleted unnecessary Xcode user files.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@546 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-24 14:05:16 +00:00
stevenaaus
4e1d8b749d Add cfgfile.[hc] to xcode.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@544 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-24 12:42:19 +00:00
kristianduske
d85741e19c Removed unused XCode user files.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@436 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-28 15:17:30 +00:00
kristianduske
ba47bf9ae9 Added fat binary for libmpg123 v 1.12.1 with support for ppc, i386 and x86_64.
Adapted paths for libraries within the dylibs.
Added header files for ogg, vorbis and libmpg123 to MacOSX build to avoid people having to get ahold of the music decorders when they want to build on OS X.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@435 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-28 14:28:18 +00:00
kristianduske
877c63a9d3 Added vorbis fat binaries to SVN to avoid future headaches.
Adapted XCode project so that the dylibs are copied into the App bundle (untested).

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@433 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-28 11:16:43 +00:00
kristianduske
5ccef9778c Launcher window is now centered and will launch Quake when Return key is pressed.
Enabled PPC builds.
All OS X builds are without music support for now.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@432 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-28 10:04:08 +00:00
sezero
edee6c7c21 removed references to Misc/Todo.txt and Misc/Changelog.txt from the Xcode
project files.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@396 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-12 10:20:24 +00:00
sezero
65f2ac04aa changed makefiles to use 1/0 instead of yes/no for the codec options.
made quakespasm custom conback embedding optional, still defaulting to 1.
the code requires USE_QS_CONBACK preprocessor definition.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@392 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-12 09:32:22 +00:00
sezero
b4ee053e2d renamed sound.h to q_sound.h
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@349 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 14:30:52 +00:00
kristianduske
ae617c3a1f Added version information to launcher window.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@336 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-20 08:11:33 +00:00
kristianduske
d96679c553 Changed signing scripts to use stock openssl over the macports version. Signing and automatic updates now work on OS X.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@335 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-20 06:24:15 +00:00
kristianduske
683191478c Better Sparkle Update GUI (less intrusive).
Removed Sparkle Framework to sort out SVN problems, will re-add with next commit.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@331 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-19 11:36:13 +00:00
kristianduske
587aca47b3 Change build architecture to universal PPC/x86/x86_64.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@326 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-18 09:15:22 +00:00
kristianduske
ef1f485816 Disabled automatic updates through Sparkle for now due to signing problems.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@325 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-18 09:01:16 +00:00
kristianduske
9e2893ab59 Preparations for 0.85.3 release.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@324 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-17 13:00:00 +00:00
kristianduske
159aa49a15 OS X launcher now uses -fullscreen argument to switch into fullscreen mode instead of just omitting the -windowed argument.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@279 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 22:31:28 +00:00
kristianduske
78f8041715 git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@272 af15c1b1-3010-417e-b628-4374ebc0bcbd 2010-08-14 19:41:09 +00:00
kristianduske
7817c3271a Changed base SDK to 10.4.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@266 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-13 12:05:26 +00:00
kristianduske
593f36ee98 Mac OS X launcher can be suppressed by passing "-nolauncher" on the command line.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@265 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-12 15:41:32 +00:00
kristianduske
ade148f09b Mac OS X launcher can be suppressed by passing "-nolauncher" on the command line.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@264 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-12 15:41:15 +00:00
kristianduske
47f5a1b812 Trying to recover broken XCode project files.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@263 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-10 17:51:17 +00:00
kristianduske
789dd2a686 Replaced SDL network driver with BSD driver for Mac OS X.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@261 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-09 12:44:44 +00:00
kristianduske
38c31f616f Added the Sparkle framework to OS X launcher for automatic updates (this is not entirely ready for release yet).
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@254 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-08 13:17:35 +00:00
sezero
5a98a71e47 MacOSX/QuakeSpasm.xcodeproj/
Updated XCode project files from Levent Yavas.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@167 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-05-21 19:03:17 +00:00
sezero
a8fbe377f3 removed net_udp.* from XCode project files. added conback.h to them.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@146 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 21:27:36 +00:00
sezero
fb8a9ad688 renamed main.c to main_sdl.c.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@142 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 15:21:59 +00:00
sezero
1b30b31223 added conback.c to XCode project files.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@139 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 13:55:15 +00:00
sezero
72abbd23f9 removed macmini.* from the MacOSX XCode project directory.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@137 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 13:47:52 +00:00
sezero
17b78d5a16 renamed several Fitzquake.* files to QuakeSpasm.* and adjusted the places
where they are referenced.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@133 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 12:48:09 +00:00