]>
git.jsancho.org Git - lugaru.git/log
Ryan C. Gordon [Fri, 14 May 2010 03:32:48 +0000 (23:32 -0400)]
Fixed another printf() format string issue.
Ryan C. Gordon [Fri, 14 May 2010 03:30:32 +0000 (23:30 -0400)]
Fixed printf() formatting string.
Neal Gompa [Fri, 14 May 2010 03:26:06 +0000 (22:26 -0500)]
Fixed SDL linkage and internal libjpeg linkage breaks
Neal Gompa [Fri, 14 May 2010 02:46:12 +0000 (21:46 -0500)]
Fixed paths for MinGW SDL libraries
Neal Gompa [Fri, 14 May 2010 01:43:09 +0000 (20:43 -0500)]
Reverted internal SDL lib configuration modification, made the problem worse
Neal Gompa [Fri, 14 May 2010 01:00:42 +0000 (20:00 -0500)]
Modified internal SDL lib configuration to properly set up; Added #undef/#define to 'openal_wrapper.h' to fix building on Windows
Neal Gompa [Fri, 14 May 2010 00:10:27 +0000 (19:10 -0500)]
Fixed CMake detection of internal libs
Neal Gompa [Fri, 14 May 2010 00:07:17 +0000 (19:07 -0500)]
Merged
Neal Gompa [Fri, 14 May 2010 00:06:55 +0000 (19:06 -0500)]
Something screwy with internal headers, added headers from OpenAL-Soft
Neal Gompa [Fri, 14 May 2010 00:05:44 +0000 (19:05 -0500)]
Something screwy with internal headers, replaced them with headers from OpenAL-Soft
Harley Laue [Thu, 13 May 2010 23:50:20 +0000 (18:50 -0500)]
Merged
Harley Laue [Thu, 13 May 2010 23:49:02 +0000 (18:49 -0500)]
Fixed CMake so Force internal actually has a chance at working correctly
Harley Laue [Thu, 13 May 2010 23:48:38 +0000 (18:48 -0500)]
Missed an fmod header
Neal Gompa [Thu, 13 May 2010 23:46:45 +0000 (18:46 -0500)]
Fixed install paths in CMake so that the compiled binary is properly installed
Neal Gompa [Thu, 13 May 2010 23:34:13 +0000 (18:34 -0500)]
Fixed includes in 'openal_wrapper.h' to fit with CMake's detection scheme
Neal Gompa [Thu, 13 May 2010 23:26:30 +0000 (18:26 -0500)]
Fixed error in handling Lugaru's default Windows install prefix
Harley Laue [Thu, 13 May 2010 23:25:02 +0000 (18:25 -0500)]
Seems there were a few things I forgot when I removed FMod. Should be about it
Neal Gompa [Thu, 13 May 2010 23:23:30 +0000 (18:23 -0500)]
Oops, forgot to actually pre-define the OpenAL internal library configuration
Neal Gompa [Thu, 13 May 2010 23:15:36 +0000 (18:15 -0500)]
Oops, forgot to actually commit the MinGW OpenAL libs themselves...
Neal Gompa [Thu, 13 May 2010 23:14:24 +0000 (18:14 -0500)]
Merged
Neal Gompa [Thu, 13 May 2010 23:13:24 +0000 (18:13 -0500)]
Added internal OpenAL libs for MinGW on Windows; MSVC internal libs to come soon
Harley Laue [Thu, 13 May 2010 22:51:53 +0000 (17:51 -0500)]
Forgot to update CMake... again...
Harley Laue [Thu, 13 May 2010 22:50:33 +0000 (17:50 -0500)]
Merged FMod changes in
Harley Laue [Thu, 13 May 2010 22:41:02 +0000 (17:41 -0500)]
Removed FMod from the source.
* This isn't the best fix yet, but it works and should be a good starting point
in the future.
Neal Gompa [Thu, 13 May 2010 22:09:27 +0000 (17:09 -0500)]
Added 'mesa_wgl.h' to make OpenGL headers happy on Windows
Neal Gompa [Thu, 13 May 2010 22:03:23 +0000 (17:03 -0500)]
Added win32 SDL libraries for MinGW and MSVC; Modified CMake scripts to properly install 'SDL.dll' to install prefix
Christian Ohm [Thu, 13 May 2010 18:01:23 +0000 (20:01 +0200)]
Get rid of dupicated code in the text routines.
Ryan C. Gordon [Thu, 13 May 2010 20:06:37 +0000 (16:06 -0400)]
Fixed dependencies, made them optional (so you can override system libs).
Ryan C. Gordon [Thu, 13 May 2010 18:45:07 +0000 (14:45 -0400)]
Merge.
Ryan C. Gordon [Thu, 13 May 2010 18:43:12 +0000 (14:43 -0400)]
Reworked CMakeLists.txt.
Now it is all contained in one file, instead of spread over subdirs,
and dependencies will fall back to internal versions if they aren't found
on the system.
This work is still in progress!
Neal Gompa [Thu, 13 May 2010 16:38:19 +0000 (11:38 -0500)]
Remove 'wincompat.h' from CMake scripts to let it build again
Harley Laue [Thu, 13 May 2010 16:31:00 +0000 (11:31 -0500)]
wincompat.h doesn't seem to be used, and it has a questionable copyright
notice.
* It's most likely ok, but we don't need it really either way
Ryan C. Gordon [Thu, 13 May 2010 14:57:49 +0000 (10:57 -0400)]
Cleaned up the stricmp() nonsense.
Ryan C. Gordon [Thu, 13 May 2010 14:43:47 +0000 (10:43 -0400)]
Fixed Mac builds with makefile.old.
Harley Laue [Thu, 13 May 2010 13:42:55 +0000 (08:42 -0500)]
Looks like UNIX also needs the MacCompatibility.cpp for ConvertFileName.
* We may look into a better way of doing this in the future...
Harley Laue [Thu, 13 May 2010 13:37:53 +0000 (08:37 -0500)]
Kill Windows line endings in the middle of the file
Neal Gompa [Thu, 13 May 2010 08:14:35 +0000 (03:14 -0500)]
Made fixes for includes in 'openal_wrapper.cpp' and tweaked the CMake scripts a bit
Neal Gompa [Thu, 13 May 2010 07:51:26 +0000 (02:51 -0500)]
More fixes to 'OpenGL_Windows.cpp' to work on Linux and Windows
Neal Gompa [Thu, 13 May 2010 07:35:07 +0000 (02:35 -0500)]
Fixed 'OpenGL_Windows.cpp' to work on Linux and Windows; Fixed 'Sources/CMakeLists.txt' for Windows build
Neal Gompa [Thu, 13 May 2010 07:11:05 +0000 (02:11 -0500)]
fixed header include for Windows in 'openal_wrapper.cpp'
Neal Gompa [Thu, 13 May 2010 07:07:50 +0000 (02:07 -0500)]
Fixed a typo in setting OpenAL include directory paths
Ryan C. Gordon [Thu, 13 May 2010 07:05:00 +0000 (03:05 -0400)]
Fixed command key sticking (where Mac users might quit game by accident).
Thanks to Kao Felix for the fix!
Ryan C. Gordon [Thu, 13 May 2010 06:44:41 +0000 (02:44 -0400)]
Some Windows build fixes.
Ryan C. Gordon [Thu, 13 May 2010 05:25:44 +0000 (01:25 -0400)]
Merge.
Neal Gompa [Thu, 13 May 2010 05:08:25 +0000 (00:08 -0500)]
Removed superfluous files from CMakeLists source tree listing
Ryan C. Gordon [Thu, 13 May 2010 04:56:34 +0000 (00:56 -0400)]
Removed some commented code that isn't coming back.
Ryan C. Gordon [Thu, 13 May 2010 04:55:13 +0000 (00:55 -0400)]
Removed some unneeded source files.
Ryan C. Gordon [Thu, 13 May 2010 04:49:03 +0000 (00:49 -0400)]
Merge.
Neal Gompa [Thu, 13 May 2010 04:37:25 +0000 (23:37 -0500)]
Added a conditional to fix for Windows
Ryan C. Gordon [Thu, 13 May 2010 04:25:48 +0000 (00:25 -0400)]
Fixed makemac.sh
Neal Gompa [Thu, 13 May 2010 04:09:20 +0000 (23:09 -0500)]
Removed redundant OpenGL utility function definition
Ryan C. Gordon [Thu, 13 May 2010 04:08:21 +0000 (00:08 -0400)]
Make RUNDIR be "." in makefile.old.
...since you have to run below the Data directory.
Ryan C. Gordon [Thu, 13 May 2010 04:06:46 +0000 (00:06 -0400)]
Updated Xcode project for new dependencies.
Ryan C. Gordon [Thu, 13 May 2010 03:44:34 +0000 (23:44 -0400)]
Updated makefile.old with the new dependencies stuff.
Ryan C. Gordon [Thu, 13 May 2010 03:41:54 +0000 (23:41 -0400)]
Added a basic libjpeg config header.
Neal Gompa [Thu, 13 May 2010 03:16:28 +0000 (22:16 -0500)]
Fixed 'head' define to C++ style constant to fix breakage with zlib
Ryan C. Gordon [Thu, 13 May 2010 02:24:44 +0000 (22:24 -0400)]
Moved prebuilt Mac OS X SDL libs to Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 02:22:46 +0000 (22:22 -0400)]
Upgraded libvorbis from 1.0.1 to 1.3.1 and moved it to Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 02:21:19 +0000 (22:21 -0400)]
Upgraded libogg from 1.0 to 2.0 and moved it to Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 02:20:08 +0000 (22:20 -0400)]
Upgraded libpng from 1.2.8 to 1.4.1 and moved it to Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 01:39:48 +0000 (21:39 -0400)]
Upgraded zlib from 1.2.3 to 1.2.5 and moved it to Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 01:38:41 +0000 (21:38 -0400)]
Upgraded libjpeg from 6b to 8a and moved it to Dependencies.
Neal Gompa [Thu, 13 May 2010 01:38:35 +0000 (20:38 -0500)]
Added extern structure to 'OpenGL_Windows.cpp' and fixed header inclusion order
Ryan C. Gordon [Thu, 13 May 2010 01:29:25 +0000 (21:29 -0400)]
Moving OpenAL into dependencies.
Ryan C. Gordon [Thu, 13 May 2010 01:28:55 +0000 (21:28 -0400)]
Moving GL headers into Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 01:28:32 +0000 (21:28 -0400)]
Removing GL headers we don't need.
Ryan C. Gordon [Thu, 13 May 2010 01:26:47 +0000 (21:26 -0400)]
Moving SDL12 headers into Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 01:26:22 +0000 (21:26 -0400)]
Moving GLU sources into a Dependencies directory.
Neal Gompa [Thu, 13 May 2010 01:18:49 +0000 (20:18 -0500)]
Merged changes for 'CMakeLists.txt'
Neal Gompa [Thu, 13 May 2010 01:17:36 +0000 (20:17 -0500)]
Huge fix in 'WinInput.cpp'! Added conditional code for key mappings
Harley Laue [Thu, 13 May 2010 01:15:36 +0000 (20:15 -0500)]
Oops, BZip2 isn't really a dependency!
Neal Gompa [Thu, 13 May 2010 00:49:24 +0000 (19:49 -0500)]
More Windows include fixes in 'OpenGL_Windows.cpp' and some in 'TGALoader.cpp'
Neal Gompa [Thu, 13 May 2010 00:38:56 +0000 (19:38 -0500)]
Disabled inclusion of 'vld.h' in 'OpenGL_Windows.cpp' because we don't need Visual Leak Detector
Neal Gompa [Thu, 13 May 2010 00:08:00 +0000 (19:08 -0500)]
Disabled inclusion of unneeded Windows header files in 'gamegl.h'
Neal Gompa [Wed, 12 May 2010 23:29:52 +0000 (18:29 -0500)]
Switching to default branch and closing cmake branch; Merged with Icculus's repository
Neal Gompa [Wed, 12 May 2010 23:17:19 +0000 (18:17 -0500)]
Fixed Windows conditionals for building resources and OpenGL library linkage in CMake scripts; Switching to default branch
Neal Gompa [Wed, 12 May 2010 22:48:24 +0000 (17:48 -0500)]
Added Win32 conditional to CMake scripts for building on Windows
Ryan C. Gordon [Wed, 12 May 2010 22:45:27 +0000 (18:45 -0400)]
Merged latest cmake branch to default.
Neal Gompa [Wed, 12 May 2010 22:43:19 +0000 (17:43 -0500)]
Made initial fixes towards building in MinGW for 32-bit Windows
Ryan C. Gordon [Wed, 12 May 2010 22:27:07 +0000 (18:27 -0400)]
Removed Logger (it's not GPL compatible).
Ryan C. Gordon [Wed, 12 May 2010 22:25:58 +0000 (18:25 -0400)]
Added prebuilt Mac SDL libraries.
Reece Dunn [Wed, 12 May 2010 21:40:52 +0000 (22:40 +0100)]
Use const char * for string arguments to avoid deprecated conversion warnings.
Ryan C. Gordon [Thu, 13 May 2010 00:56:47 +0000 (20:56 -0400)]
Merge to unconfuse my repo.
Ryan C. Gordon [Thu, 13 May 2010 00:48:06 +0000 (20:48 -0400)]
makemac.sh updated for Data directory.
Ryan C. Gordon [Thu, 13 May 2010 00:47:46 +0000 (20:47 -0400)]
jpeglib (etc) need to be wrapped in extern "C". :/
Marcus Comstedt [Wed, 12 May 2010 22:13:57 +0000 (00:13 +0200)]
Use system g++ and SDL/OpenAL on Linux
Ryan C. Gordon [Wed, 12 May 2010 23:09:17 +0000 (19:09 -0400)]
Merge to mainline.
Ryan C. Gordon [Wed, 12 May 2010 20:50:59 +0000 (16:50 -0400)]
Merging cmake branch to the default branch.
Neal Gompa [Wed, 12 May 2010 18:46:50 +0000 (13:46 -0500)]
Updated 'FindOggVorbis.cmake' to work better on Linux (hopefully fixes Windows Ogg detection too)
Neal Gompa [Wed, 12 May 2010 05:04:20 +0000 (00:04 -0500)]
Added 'CONTENT-LICENSE.txt' with info about game asset licensing
Harley Laue [Wed, 12 May 2010 04:50:48 +0000 (23:50 -0500)]
Pulled full demo content back in so installing installs a playable game
Neal Gompa [Wed, 12 May 2010 04:46:53 +0000 (23:46 -0500)]
Added the new Windows source code files to the CMake scripts
Harley Laue [Wed, 12 May 2010 04:19:19 +0000 (23:19 -0500)]
merged
Harley Laue [Wed, 12 May 2010 04:11:51 +0000 (23:11 -0500)]
Added a couple missing Windows files
Neal Gompa [Wed, 12 May 2010 04:10:02 +0000 (23:10 -0500)]
Added support for compiling Windows *.rc files included into the CMake scripts
Neal Gompa [Wed, 12 May 2010 03:14:18 +0000 (22:14 -0500)]
Resolved merges again
Neal Gompa [Wed, 12 May 2010 03:09:34 +0000 (22:09 -0500)]
Resolved merges of FindOggVorbis.cmake and CMakeLists.txt
Neal Gompa [Wed, 12 May 2010 02:27:16 +0000 (21:27 -0500)]
Renaming old makefile to makefile.old - Indicating deprecation of makefile
Neal Gompa [Wed, 12 May 2010 02:22:23 +0000 (21:22 -0500)]
Removing Visual Studio Projects -- superseded by CMake
Neal Gompa [Wed, 12 May 2010 02:21:26 +0000 (21:21 -0500)]
Added support for 'make install' target in CMake scripts