pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4640 commits 52 branches 0 tags 129 MiB
Commit graph

29 commits

Author SHA1 Message Date
Sam Lantinga
782b8b7d6e Fixed bug 1185 (VS 2010 project files do not support side-by-side 32-bit and 64-bit builds) 
Ed Kiser      2011-04-19 09:28:53 PDT

The Visual Studio 2010 project files have hard-coded relative paths which
prevent them from doing side-by-side 32-bit and 64-bit builds.

I have attached a patch that appears to fix this problem.
 2011-04-19 09:53:01 -07:00
Sam Lantinga
4c83734b3f Fixed debug format 2011-02-17 18:53:46 -08:00
Sam Lantinga
6ade085169 Removed the obsolete NoSTDIO configurations 2011-02-17 12:16:01 -08:00
Sam Lantinga
e0bf2dc643 Made it possible to build SDL from a fresh checkout without any additional steps. 
The trick is that if you're using configure and you don't want to have SDL_config.h and SDL_revision.h to show up as modified, you need to configure and build from a separate directory.

You also need to include SDL_revision.h directly if you want to use the SDL_REVISION constant, as a side effect of these changes.

--HG--
rename : include/SDL_config.h.default => include/SDL_config.h
 2011-02-16 02:37:09 -08:00
Sam Lantinga
b0a2a8957e Fixed quotes around Mercurial revision text 2011-01-27 20:37:54 -08:00
Sam Lantinga
7d33cf09be 0 isn't a valid Mercurial revision 2011-01-27 20:14:10 -08:00
krogoway
7f1b3595cc Always copy the SDL_config_windows.h to SDL_config.h for VisualC 2005, 2008 and 2010 projects. 2011-01-27 20:30:39 -06:00
Sam Lantinga
9d25ba272a Fixed bug #925 
Changed "win32" to "windows"

--HG--
rename : include/SDL_config_win32.h => include/SDL_config_windows.h
rename : src/events/scancodes_win32.h => src/events/scancodes_windows.h
rename : src/haptic/win32/SDL_syshaptic.c => src/haptic/windows/SDL_syshaptic.c
rename : src/joystick/win32/SDL_dxjoystick.c => src/joystick/windows/SDL_dxjoystick.c
rename : src/joystick/win32/SDL_dxjoystick_c.h => src/joystick/windows/SDL_dxjoystick_c.h
rename : src/joystick/win32/SDL_mmjoystick.c => src/joystick/windows/SDL_mmjoystick.c
rename : src/loadso/win32/SDL_sysloadso.c => src/loadso/windows/SDL_sysloadso.c
rename : src/main/win32/SDL_win32_main.c => src/main/windows/SDL_windows_main.c
rename : src/main/win32/version.rc => src/main/windows/version.rc
rename : src/thread/win32/SDL_sysmutex.c => src/thread/windows/SDL_sysmutex.c
rename : src/thread/win32/SDL_syssem.c => src/thread/windows/SDL_syssem.c
rename : src/thread/win32/SDL_systhread.c => src/thread/windows/SDL_systhread.c
rename : src/thread/win32/SDL_systhread_c.h => src/thread/windows/SDL_systhread_c.h
rename : src/thread/win32/win_ce_semaphore.c => src/thread/windows/win_ce_semaphore.c
rename : src/thread/win32/win_ce_semaphore.h => src/thread/windows/win_ce_semaphore.h
rename : src/timer/win32/SDL_systimer.c => src/timer/windows/SDL_systimer.c
rename : src/video/win32/SDL_ceddrawrender.c => src/video/windows/SDL_ceddrawrender.c
rename : src/video/win32/SDL_ceddrawrender.h => src/video/windows/SDL_ceddrawrender.h
rename : src/video/win32/SDL_d3drender.c => src/video/windows/SDL_d3drender.c
rename : src/video/win32/SDL_d3drender.h => src/video/windows/SDL_d3drender.h
rename : src/video/win32/SDL_gapirender.c => src/video/windows/SDL_gapirender.c
rename : src/video/win32/SDL_gapirender.h => src/video/windows/SDL_gapirender.h
rename : src/video/win32/SDL_gapirender_c.h => src/video/windows/SDL_gapirender_c.h
rename : src/video/win32/SDL_gdirender.c => src/video/windows/SDL_gdirender.c
rename : src/video/win32/SDL_gdirender.h => src/video/windows/SDL_gdirender.h
rename : src/video/win32/SDL_msctf.h => src/video/windows/SDL_msctf.h
rename : src/video/win32/SDL_vkeys.h => src/video/windows/SDL_vkeys.h
rename : src/video/win32/SDL_win32clipboard.c => src/video/windows/SDL_windowsclipboard.c
rename : src/video/win32/SDL_win32clipboard.h => src/video/windows/SDL_windowsclipboard.h
rename : src/video/win32/SDL_win32events.c => src/video/windows/SDL_windowsevents.c
rename : src/video/win32/SDL_win32events.h => src/video/windows/SDL_windowsevents.h
rename : src/video/win32/SDL_win32gamma.c => src/video/windows/SDL_windowsgamma.c
rename : src/video/win32/SDL_win32gamma.h => src/video/windows/SDL_windowsgamma.h
rename : src/video/win32/SDL_win32keyboard.c => src/video/windows/SDL_windowskeyboard.c
rename : src/video/win32/SDL_win32keyboard.h => src/video/windows/SDL_windowskeyboard.h
rename : src/video/win32/SDL_win32modes.c => src/video/windows/SDL_windowsmodes.c
rename : src/video/win32/SDL_win32modes.h => src/video/windows/SDL_windowsmodes.h
rename : src/video/win32/SDL_win32mouse.c => src/video/windows/SDL_windowsmouse.c
rename : src/video/win32/SDL_win32mouse.h => src/video/windows/SDL_windowsmouse.h
rename : src/video/win32/SDL_win32opengl.c => src/video/windows/SDL_windowsopengl.c
rename : src/video/win32/SDL_win32opengl.h => src/video/windows/SDL_windowsopengl.h
rename : src/video/win32/SDL_win32shape.c => src/video/windows/SDL_windowsshape.c
rename : src/video/win32/SDL_win32shape.h => src/video/windows/SDL_windowsshape.h
rename : src/video/win32/SDL_win32video.c => src/video/windows/SDL_windowsvideo.c
rename : src/video/win32/SDL_win32video.h => src/video/windows/SDL_windowsvideo.h
rename : src/video/win32/SDL_win32window.c => src/video/windows/SDL_windowswindow.c
rename : src/video/win32/SDL_win32window.h => src/video/windows/SDL_windowswindow.h
rename : src/video/win32/wmmsg.h => src/video/windows/wmmsg.h
 2011-01-20 18:04:05 -08:00
Sam Lantinga
de8bd33888 Use the debug C runtime for the debug configuration 2011-01-19 13:50:53 -08:00
Sam Lantinga
21f3b33f9c Jcw87 to Sam 
The project files for VS 2005 are still outdated/messed up. I have a patch that will bring the VS 2005 project files up to date with the VS 2008 project files, add the x64 platform to the VS 2005 project files, fix a few issues with x64 in VS 2008, and a few other misc changes that don't really change the output at all.
 2011-01-09 08:35:18 -08:00
Sam Lantinga
7c463932c2 Merged Eli's Google Summer of Code work from SDL-gsoc2010-shaped_windows 
--HG--
rename : VisualC/SDL.sln => VisualC/SDL_VS2005.sln
 2010-08-22 13:45:56 -07:00
egottlieb
2d2a93ff5d Removed superfluous VS2010 build files. 2010-08-03 10:10:06 -04:00
egottlieb
4caaaf9b10 Added VS2010 build files. 2010-08-02 21:43:08 -04:00
Eli Gottlieb
f9048e7257 Reapplied Win32 make-it-build patch. What's going on? Still get rendering artifacts when testing on x11, have literally no idea why. 2010-07-20 12:42:43 -04:00
Jim Grandpre
987edb15b3 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. 2010-07-13 18:31:09 -04:00
Sam Lantinga
22a37911dd Merged changes from the main SDL codebase 
--HG--
rename : VisualC/SDL/SDL.vcproj => VisualC/SDL/SDL_VS2005.vcproj
rename : VisualC/SDL.sln => VisualC/SDL_VS2005.sln
rename : VisualC/SDLmain/SDLmain.vcproj => VisualC/SDLmain/SDLmain_VS2005.vcproj
 2010-07-12 21:09:23 -07:00
Sam Lantinga
3ff2d236cd Added Windows clipboard support 2010-07-08 05:43:34 -07:00
Sam Lantinga
52b4147239 Removed obsolete header file 2010-07-06 10:58:23 -07:00
Sam Lantinga
cd68729bb4 Split out the Visual C++ 2005 and 2008 projects explicitly. 
Added the test programs to the Visual C++ 2008 project.

--HG--
rename : VisualC/SDL/SDL.vcproj => VisualC/SDL/SDL_VS2005.vcproj
rename : VisualC/SDL.sln => VisualC/SDL_VS2005.sln
rename : VisualC/SDLmain/SDLmain.vcproj => VisualC/SDLmain/SDLmain_VS2005.vcproj
rename : VisualC/tests/automated/automated.vcproj => VisualC/tests/automated/automated_VS2008.vcproj
rename : VisualC/tests/checkkeys/checkkeys.vcproj => VisualC/tests/checkkeys/checkkeys_VS2005.vcproj
rename : VisualC/tests/graywin/graywin.vcproj => VisualC/tests/graywin/graywin_VS2005.vcproj
rename : VisualC/tests/loopwave/loopwave.vcproj => VisualC/tests/loopwave/loopwave_VS2005.vcproj
rename : VisualC/tests/testalpha/testalpha.vcproj => VisualC/tests/testalpha/testalpha_VS2005.vcproj
rename : VisualC/tests/testdraw2/testdraw2.vcproj => VisualC/tests/testdraw2/testdraw2_VS2005.vcproj
rename : VisualC/tests/testfile/testfile.vcproj => VisualC/tests/testfile/testfile_VS2005.vcproj
rename : VisualC/tests/testgamma/testgamma.vcproj => VisualC/tests/testgamma/testgamma_VS2005.vcproj
rename : VisualC/tests/testgl/testgl.vcproj => VisualC/tests/testgl/testgl_VS2005.vcproj
rename : VisualC/tests/testgl2/testgl2.vcproj => VisualC/tests/testgl2/testgl2_VS2005.vcproj
rename : VisualC/tests/testjoystick/testjoystick.vcproj => VisualC/tests/testjoystick/testjoystick_VS2005.vcproj
rename : VisualC/tests/testoverlay/testoverlay.vcproj => VisualC/tests/testoverlay/testoverlay_VS2005.vcproj
rename : VisualC/tests/testoverlay2/testoverlay2.vcproj => VisualC/tests/testoverlay2/testoverlay2_VS2005.vcproj
rename : VisualC/tests/testpalette/testpalette.vcproj => VisualC/tests/testpalette/testpalette_VS2005.vcproj
rename : VisualC/tests/testplatform/testplatform.vcproj => VisualC/tests/testplatform/testplatform_VS2005.vcproj
rename : VisualC/tests/testpower/testpower.vcproj => VisualC/tests/testpower/testpower_VS2005.vcproj
rename : VisualC/tests/testsprite/testsprite.vcproj => VisualC/tests/testsprite/testsprite_VS2005.vcproj
rename : VisualC/tests/testsprite2/testsprite2.vcproj => VisualC/tests/testsprite2/testsprite2_VS2005.vcproj
rename : VisualC/tests/testvidinfo/testvidinfo.vcproj => VisualC/tests/testvidinfo/testvidinfo_VS2005.vcproj
rename : VisualC/tests/testwin/testwin.vcproj => VisualC/tests/testwin/testwin_VS2005.vcproj
rename : VisualC/tests/testwm/testwm.vcproj => VisualC/tests/testwm/testwm_VS2005.vcproj
 2010-07-05 17:10:34 -07:00
jimtla
2ab139c207 Fixed some windows compilation bugs - Still does not compile. 2010-06-03 11:08:17 -04:00
Sam Lantinga
0347900a7a Whoops, need " inside quotes 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404107
 2009-10-17 23:29:52 +00:00
Sam Lantinga
c331a14ce1 Fixed bug #852 
Jesse Anders      2009-10-17 14:17:25 PDT

In VC++, the build script that creates SDL_config.h and SDL_revision.h fails
when the project directory path includes spaces. For example, if the project
directory path is:

c:\Documents and Settings\Jesse\My Documents\Visual Studio 2008\Projects\SDL
1.3\VisualC\SDL\

The following error is generated:

'and' is not recognized as an internal or external command

Placing all paths in quotes fixes this.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404106
 2009-10-17 21:46:08 +00:00
Sam Lantinga
88141c3407 Whoops, the ProjectDir is one level lower than the SolutionDir 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404053
 2009-10-11 10:30:47 +00:00
Sam Lantinga
ad98374d82 stefanullinger to me 
I updated and wanted to compile SDL, but it does not work.
The reason is the new pre-build step.

Currently it says:

"if exist $(SolutionDir)\..\include\SDL_config.h goto SDLCONFIGOKAY
echo Copying SDL_config_win32.h to SDL_config.h...
copy $(SolutionDir)\..\include\SDL_config_win32.h $(SolutionDir)\..\include\SDL_config.h
:SDLCONFIGOKAY

if exist $(SolutionDir)\..\include\SDL_revision.h goto SDLREVISIONOKAY
echo Creating stub SDL_revision.h file...
echo #define SDL_REVISION 0 >$(SolutionDir)\..\include\SDL_revision.h
:SDLREVISIONOKAY"


So ... the problem with this lines is, that they lookup the SolutionDir...
I think it should use the ProjectDir here!
I - for example - want to use SDL within my engine...
So my engine is the solutionDir...not SDL...SDL is just a sub-project.

I think you should change this, shouldn't you?!

Regards,
Stefan

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404052
 2009-10-11 10:22:22 +00:00
Sam Lantinga
4b40e7c5a6 Fixed bug #830 
Added pre-build step to generate required headers

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403995
 2009-10-08 09:37:58 +00:00
Sam Lantinga
a6c38ff9a2 Fixed bug #830 
Added pre-build step to generate required headers

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403994
 2009-10-08 09:32:07 +00:00
Sam Lantinga
59d9335a2a Upgraded solution to Visual Studio 2008 and added 64-bit target 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403784
 2009-09-06 04:40:29 +00:00
Sam Lantinga
8312eae257 Visual C++ 5 and 6 are no longer supported. You can use Visual C++ Express Edition to build SDL. 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403385
 2008-12-30 03:51:20 +00:00
Sam Lantinga
316a61731f Unpacked project archives to get individual file history in subversion 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402564
 2007-07-21 17:09:01 +00:00