adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge post-0.7.0 commits through 'c8250d8b8' into v0.7.2.

Browse Source 
sdl_common.c has lost some commits in the restructuring and those
will need to be replayed over the restructured files for SDL1 and 2.
This commit is contained in:
Michael Martin
2020-04-03 17:43:49 -07:00
parent 0e021ac55a c8250d8b8b
commit 562917b456
597 changed files with 10714 additions and 5297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build/msvc6/UrQuanMasters.dsp
+26 -6
View File
@@ -74,7 +74,7 @@ PostBuild_Cmds=rebase -b 0x400000 -x . "../../uqm.exe"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\src\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /D "USE_PLATFORM_ACCEL" /FR /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\src\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "DEBUG_DCQ_THREADS" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /D "USE_PLATFORM_ACCEL" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -101,7 +101,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\src\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /FR /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\src\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "DEBUG_DCQ_THREADS" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -215,6 +215,14 @@ SOURCE=..\..\src\libs\callback\alarm.h
# End Source File
# Begin Source File
SOURCE=..\..\src\libs\callback\async.c
# End Source File
# Begin Source File
SOURCE=..\..\src\libs\callback\async.h
# End Source File
# Begin Source File
SOURCE=..\..\src\libs\callback\callback.c
# End Source File
# Begin Source File
@@ -1490,6 +1498,10 @@ SOURCE=..\..\src\libs\alarm.h
# End Source File
# Begin Source File
SOURCE=..\..\src\libs\async.h
# End Source File
# Begin Source File
SOURCE=..\..\src\libs\callback.h
# End Source File
# Begin Source File
@@ -2237,6 +2249,10 @@ SOURCE=..\..\src\uqm\planets\solarsys.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\planets\solarsys.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\planets\sundata.h
# End Source File
# Begin Source File
@@ -3138,6 +3154,10 @@ SOURCE=..\..\src\uqm\controls.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\corecode.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\credits.c
# End Source File
# Begin Source File
@@ -3494,6 +3514,10 @@ SOURCE=..\..\src\uqm\starmap.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\starmap.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\state.c
# End Source File
# Begin Source File
@@ -3650,10 +3674,6 @@ SOURCE=..\..\doc\devel\glossary
# End Source File
# Begin Source File
SOURCE=..\..\doc\devel\graphicslock
# End Source File
# Begin Source File
SOURCE=..\..\doc\devel\input
# End Source File
# Begin Source File