Commit Graph

80 Commits

Author SHA1 Message Date
alexey.lysiuk 510ed27028 Added pmove files to Xcode project 2023-11-05 10:49:58 +02:00
Shpoike 22c1759a22 I'm told this fixes an xcode issue. Not that I can test it or anything. 2023-07-11 05:16:17 +01:00
Shpoike 26f0bc4682 Merge remote-tracking branch 'sf/master' into qss
(cl_startdemos stripped in favour of QSS's existing cl_demoreel cvar. osx project files ignored.)
2022-04-27 22:32:40 +01:00
Ozkan Sezer 963646b6cd rename QuakeSpasm-SDL2-64.xcscheme too. 2022-04-06 14:04:00 +03:00
Ozkan Sezer 0974ef4024 Xcode: removed irrelevant OTHER_CFLAGS / OTHER_LDFLAGS from x64 target 2022-04-06 12:55:24 +03:00
Ozkan Sezer f53706392e Xcode: renamed QuakeSpasm-SDL2-64 target to QuakeSpasm-SDL2-x64 2022-04-06 12:55:10 +03:00
Ozkan Sezer 40423a1d2c remove irrelevant xcuserdata from Xcode project 2022-04-06 12:32:56 +03:00
atsb 7bca6a764d 2 new targets within the original xcode project 2022-04-05 20:47:13 +02:00
Ozkan Sezer b0767dbc90 add back snd_modplug (disabled, for future ref.), update project files. 2022-03-29 17:04:02 +03:00
Eric Wasylishen 7acc173b47 mac: remove obsolete SDL1.2 Xcode project target 2022-01-02 13:30:30 -07:00
Eric Wasylishen d51dc7a194 macos: preliminary auto-build.yml github action
- add build-macos.sh script
- copy Quakespasm-Spiked.txt to build artifacts folder
- create Quakespasm-Spiked-Revision.txt file
2021-12-30 01:39:47 -07:00
Eric Wasylishen ff7e884c44 macos: project.pbxproj: various updates
- add qss source files
- link with static libs from vcpkg
- update header search path for vcpkg
- define USE_ZLIB
- added --deep to OTHER_CODE_SIGN_FLAGS to fix code signing error
  (https://stackoverflow.com/a/60099521)
- use deployment target 10.9
- only build x86_64
- rename QuakeSpasm-SDL2 target to QuakeSpasm-Spiked-SDL2
2021-12-29 19:53:28 -07:00
Shpoike bad54d50cf Merge remote-tracking branch 'sf/master' into qss 2021-09-11 04:49:40 +01:00
Ozkan Sezer 96a8ba1d78 updated XCode project files. 2021-09-08 23:50:50 +03:00
Ozkan Sezer 848aa26b3c silence opengl deprecation warnings from newer mac sdks. 2021-06-28 03:01:02 +03:00
Ozkan Sezer ffe43cf024 snd_mp3.c: moved mp3 tag stuff into a separate module snd_mp3tag.c
so that it can be used in snd_mpg123.c, too, if needed.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1658 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-12 11:37:32 +00:00
Eric Wasylishen ffb9692e13 Xcode project: set tab width to 8
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1419 af15c1b1-3010-417e-b628-4374ebc0bcbd
2017-06-23 23:22:09 +00:00
Eric Wasylishen 752087c517 QuakeSpasm.xcodeproj: copy quakespasm.pak/license/readmes to build products directory
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1356 af15c1b1-3010-417e-b628-4374ebc0bcbd
2016-10-22 18:38:42 +00:00
Eric Wasylishen 09339db1fc QuakeSpasm.xcodeproj: make this Xcode project deployment target 10.6, even for the SDL1.2 target. The other Xcode project can be used for building 10.4 compatible builds
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2016-10-21 20:26:33 +00:00
Eric Wasylishen 67e8f04f65 Xcode project: set deployment target to 10.6 for QuakeSpasm-SDL2
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1349 af15c1b1-3010-417e-b628-4374ebc0bcbd
2016-10-13 20:31:48 +00:00
Eric Wasylishen d5c706899b Xcode project: set LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"
This makes the official http://libsdl.org/ frameworks work with QS

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1347 af15c1b1-3010-417e-b628-4374ebc0bcbd
2016-10-13 19:39:25 +00:00
Eric Wasylishen b7a0540bdf Xcode project:
-adjust release builds to not require 10.6 SDK, and disable PPC since recent OSX SDK's don't support it
-don't strip symbols, to make testing in Instruments easier.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1285 af15c1b1-3010-417e-b628-4374ebc0bcbd
2016-01-29 00:31:27 +00:00
Eric Wasylishen 814c9c6c0f Xcode project: build debug builds with all music codecs
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1254 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-09-22 06:11:12 +00:00
Eric Wasylishen 524fe7cb60 xcode project: add indentation settings
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1215 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-25 19:55:58 +00:00
Eric Wasylishen 9f8bf689c2 Xcode proj: Rename build product for SDL2 target to QuakeSpasm-SDL2.app
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1193 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-17 22:35:00 +00:00
Ozkan Sezer 085767f3ef remove unused GLUT.framework from Xcode project file
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1189 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-14 20:56:31 +00:00
Eric Wasylishen c972307236 MacOSX: unpack SDL/SDL2 from tgz. Update Xcode project to refer to these local copies instead of searching in /Library/Frameworks
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1175 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 03:13:41 +00:00
Ozkan Sezer 1e4291192c Xcode: rename QuakeSpasmSDL2 target to QuakeSpasm-SDL2
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1107 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-10-12 17:15:06 +00:00
Eric Wasylishen d1b3e7c4a3 Xcode project: adjust settings for debug variants of targets: use default SDK rather than 10.6, native architecture rather than x86_64 + i386, and the default compiler instead of llvm-gcc4.2
This should make the project build out of the box on a wider variety of systems (i.e. without needing the 10.6 sdk)

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1095 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-10-10 06:01:29 +00:00
Eric Wasylishen b4a3fa34a4 Xcode project: created "QuakeSpasmSDL2" target. It expects a copy of SDL2.framework to be in /Library/Frameworks
changes from "QuakeSpasm" target:
- remove double quotes around LIBRARY_SEARCH_PATHS values, this breaks linking on my OS X 10.6/Xcode 3.2.6 system
- drop ppc support
- add USE_SDL2 define
- bump minimum sdk deployment target to 10.5 as required by SDL2

Tested on OS X 10.6.8/Xcode 3.2.6, and OSX 10.9.4/Xcode 5.1.1.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1055 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-09-21 21:22:35 +00:00
Ozkan Sezer 4becf0b399 more xcode..
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@930 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-07-04 11:20:46 +00:00
Ozkan Sezer bd26dc4ae1 xcode project file update
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@929 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-07-02 11:20:44 +00:00
Ozkan Sezer 36da869cc9 fix typo in xcode project file.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@927 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-07-01 14:11:02 +00:00
Ozkan Sezer 24644fc262 more project file updates.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@920 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-06-21 17:55:41 +00:00
Ozkan Sezer b752f34d7a add mikmod to xcode project file. enable several extra codecs for osx and windows builds.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@919 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-06-21 15:50:09 +00:00
Ozkan Sezer d941ee83db revert r903 and the old conback hack commits. change the engine
to load id1/quakespasm.pak for content customizations.


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

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@700 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-08-16 05:15:52 +00:00
Ozkan Sezer 50e014d050 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: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@699 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-08-16 04:51:41 +00:00
Kristian Duske b269598872 Removed options for ppc64 because it cannot build anyway.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@630 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-02-10 20:41:31 +00:00
Kristian Duske a66f610d3f Fixed link to IOKit.framework in Xcode project.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@600 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-01-07 08:31:40 +00:00
Kristian Duske 1ed3e46b7a Applied patch to disable mouse acceleration in Mac OS X.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@599 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-01-07 08:26:32 +00:00
Kristian Duske 700edc2477 Removed Sparkle auto updates from OS X build and increased version numbers to 0.85.7.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@593 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-01-01 16:50:33 +00:00
Kristian Duske 533ae210a4 Updated version numbers to 0.85.6, updated sparkle files for 0.85.5, added some source files to Xcode project.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@562 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-27 17:18:28 +00:00
Kristian Duske ba2326a070 Changed version strings.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@553 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-26 22:42:21 +00:00
Kristian Duske cf197953a7 Cleaned up some build settings and fixed a minor glitch in OS X launcher UI.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@552 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-26 22:27:18 +00:00
Kristian Duske 86c56dc882 Updated schemes for cross compilation from XCode 4.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@550 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-26 18:08:21 +00:00