Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Merged changes from the main SDL codebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Jul 13, 2010
2 parents e289891 + 111d7b4 commit da58061
Show file tree
Hide file tree
Showing 150 changed files with 6,370 additions and 3,330 deletions.
14 changes: 13 additions & 1 deletion .hgignore
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -14,7 +14,19 @@ build
build-deps build-deps
VisualC VisualC
VisualCE VisualCE
Xcode # for Xcode
*.orig
*.swp
*.tmp
*.rej
*~
*.o
*.mode1*
*.model*
*.perspective*
*.perspective*
*.pbxuser
(^|/)build($|/)
.DS_Store .DS_Store
sdl.pc sdl.pc
include/SDL_config.h include/SDL_config.h
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ EMBEDSPU = @EMBEDSPU@


DIST = acinclude autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS include INSTALL Makefile.minimal Makefile.in README* sdl-config.in sdl.m4 sdl.pc.in SDL.spec SDL.spec.in src test TODO VisualC.html VisualC VisualCE Watcom-Win32.zip WhatsNew Xcode Xcode-iPhoneOS DIST = acinclude autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS include INSTALL Makefile.minimal Makefile.in README* sdl-config.in sdl.m4 sdl.pc.in SDL.spec SDL.spec.in src test TODO VisualC.html VisualC VisualCE Watcom-Win32.zip WhatsNew Xcode Xcode-iPhoneOS


HDRS = SDL.h SDL_assert.h SDL_atomic.h SDL_audio.h SDL_compat.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_haptic.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_loadso.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_name.h SDL_opengl.h SDL_opengles.h SDL_pixels.h SDL_platform.h SDL_power.h SDL_quit.h SDL_rect.h SDL_revision.h SDL_rwops.h SDL_scancode.h SDL_stdinc.h SDL_surface.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h SDL_touch.h SDL_gesture.h HDRS = SDL.h SDL_assert.h SDL_atomic.h SDL_audio.h SDL_clipboard.h SDL_compat.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_gesture.h SDL_haptic.h SDL_input.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_loadso.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_name.h SDL_opengl.h SDL_opengles.h SDL_pixels.h SDL_platform.h SDL_power.h SDL_quit.h SDL_rect.h SDL_revision.h SDL_rwops.h SDL_scancode.h SDL_stdinc.h SDL_surface.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_touch.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h


LT_AGE = @LT_AGE@ LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@ LT_CURRENT = @LT_CURRENT@
Expand Down
7 changes: 4 additions & 3 deletions Makefile.pandora
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ CFLAGS = -O3 -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp


TARGET = libSDL.a TARGET = libSDL.a


SOURCES = ./src/*.c ./src/audio/*.c ./src/cdrom/*.c ./src/cpuinfo/*.c ./src/events/*.c \ SOURCES = ./src/*.c ./src/audio/*.c ./src/cpuinfo/*.c ./src/events/*.c \
./src/file/*.c ./src/stdlib/*.c ./src/thread/*.c ./src/timer/*.c ./src/video/*.c \ ./src/file/*.c ./src/stdlib/*.c ./src/thread/*.c ./src/timer/*.c ./src/video/*.c \
./src/joystick/*.c ./src/haptic/*.c ./src/power/*.c ./src/video/dummy/*.c ./src/audio/disk/*.c \ ./src/joystick/*.c ./src/haptic/*.c ./src/power/*.c ./src/video/dummy/*.c ./src/audio/disk/*.c \
./src/audio/dummy/*.c ./src/loadso/dlopen/*.c ./src/audio/dsp/*.c ./src/audio/dma/*.c \ ./src/audio/dummy/*.c ./src/loadso/dlopen/*.c ./src/audio/dsp/*.c ./src/audio/dma/*.c \
./src/thread/pthread/SDL_systhread.c ./src/thread/pthread/SDL_syssem.c \ ./src/thread/pthread/SDL_systhread.c ./src/thread/pthread/SDL_syssem.c \
./src/thread/pthread/SDL_sysmutex.c ./src/thread/pthread/SDL_syscond.c \ ./src/thread/pthread/SDL_sysmutex.c ./src/thread/pthread/SDL_syscond.c \
./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c ./src/cdrom/dummy/*.c \ ./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c \
./src/video/pandora/SDL_pandora.o ./src/video/pandora/SDL_pandora_events.o ./src/video/x11/*.c ./src/atomic/linux/*.c \
./src/video/pandora/SDL_pandora.o ./src/video/pandora/SDL_pandora_events.o ./src/video/x11/*.c




OBJECTS = $(shell echo $(SOURCES) | sed -e 's,\.c,\.o,g') OBJECTS = $(shell echo $(SOURCES) | sed -e 's,\.c,\.o,g')
Expand Down
28 changes: 24 additions & 4 deletions VisualC/SDL/SDL.vcproj → VisualC/SDL/SDL_VS2005.vcproj
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@
RelativePath="..\..\include\SDL_audio.h" RelativePath="..\..\include\SDL_audio.h"
> >
</File> </File>
<File
RelativePath="..\..\include\SDL_clipboard.h"
>
</File>
<File <File
RelativePath="..\..\include\SDL_compat.h" RelativePath="..\..\include\SDL_compat.h"
> >
Expand Down Expand Up @@ -562,6 +566,18 @@
RelativePath="..\..\src\video\SDL_bmp.c" RelativePath="..\..\src\video\SDL_bmp.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\SDL_clipboard.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_clipboardevents.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_clipboardevents_c.h"
>
</File>
<File <File
RelativePath="..\..\src\SDL_compat.c" RelativePath="..\..\src\SDL_compat.c"
> >
Expand Down Expand Up @@ -842,10 +858,6 @@
RelativePath="..\..\src\video\SDL_stretch.c" RelativePath="..\..\src\video\SDL_stretch.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\SDL_stretch_c.h"
>
</File>
<File <File
RelativePath="..\..\src\stdlib\SDL_string.c" RelativePath="..\..\src\stdlib\SDL_string.c"
> >
Expand Down Expand Up @@ -954,6 +966,14 @@
RelativePath="..\..\src\audio\SDL_wave.h" RelativePath="..\..\src\audio\SDL_wave.h"
> >
</File> </File>
<File
RelativePath="..\..\src\video\win32\SDL_win32clipboard.c"
>
</File>
<File
RelativePath="..\..\src\video\win32\SDL_win32clipboard.h"
>
</File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32events.c" RelativePath="..\..\src\video\win32\SDL_win32events.c"
> >
Expand Down
28 changes: 24 additions & 4 deletions VisualC/SDL/SDL_VS2008.vcproj
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -382,6 +382,10 @@
RelativePath="..\..\include\SDL_audio.h" RelativePath="..\..\include\SDL_audio.h"
> >
</File> </File>
<File
RelativePath="..\..\include\SDL_clipboard.h"
>
</File>
<File <File
RelativePath="..\..\include\SDL_compat.h" RelativePath="..\..\include\SDL_compat.h"
> >
Expand Down Expand Up @@ -715,6 +719,18 @@
RelativePath="..\..\src\video\SDL_bmp.c" RelativePath="..\..\src\video\SDL_bmp.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\SDL_clipboard.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_clipboardevents.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_clipboardevents_c.h"
>
</File>
<File <File
RelativePath="..\..\src\SDL_compat.c" RelativePath="..\..\src\SDL_compat.c"
> >
Expand Down Expand Up @@ -995,10 +1011,6 @@
RelativePath="..\..\src\video\SDL_stretch.c" RelativePath="..\..\src\video\SDL_stretch.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\SDL_stretch_c.h"
>
</File>
<File <File
RelativePath="..\..\src\stdlib\SDL_string.c" RelativePath="..\..\src\stdlib\SDL_string.c"
> >
Expand Down Expand Up @@ -1099,6 +1111,14 @@
RelativePath="..\..\src\audio\SDL_wave.h" RelativePath="..\..\src\audio\SDL_wave.h"
> >
</File> </File>
<File
RelativePath="..\..\src\video\win32\SDL_win32clipboard.c"
>
</File>
<File
RelativePath="..\..\src\video\win32\SDL_win32clipboard.h"
>
</File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32events.c" RelativePath="..\..\src\video\win32\SDL_win32events.c"
> >
Expand Down
8 changes: 4 additions & 4 deletions VisualC/SDL.sln → VisualC/SDL_VS2005.sln
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,8 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 10.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2008 # Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL_VS2005.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain_VS2005.vcproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Loading

0 comments on commit da58061

Please sign in to comment.