From d8400d22de15af013f9962ae880ed8bb487ebbe7 Mon Sep 17 00:00:00 2001 From: gewlitys Date: Wed, 3 Dec 2003 23:15:23 +0000 Subject: [PATCH] Added libs/uio/utils.* to VC project file; renamed sc2code/utils.c to util.c to work around stupid conflict with VC6 (fixes bug #553) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1291 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/msvc++/UrQuanMasters.dsp | 10 +++++++++- sc2/src/sc2code/Makeinfo | 2 +- sc2/src/sc2code/{utils.c => util.c} | 0 3 files changed, 10 insertions(+), 2 deletions(-) rename sc2/src/sc2code/{utils.c => util.c} (100%) diff --git a/sc2/src/msvc++/UrQuanMasters.dsp b/sc2/src/msvc++/UrQuanMasters.dsp index 39abfa3a4..7bd0aa202 100644 --- a/sc2/src/msvc++/UrQuanMasters.dsp +++ b/sc2/src/msvc++/UrQuanMasters.dsp @@ -1035,6 +1035,14 @@ SOURCE=..\sc2code\libs\uio\uioutils.c SOURCE=..\sc2code\libs\uio\uioutils.h # End Source File +# Begin Source File + +SOURCE=..\sc2code\libs\uio\utils.c +# End Source File +# Begin Source File + +SOURCE=..\sc2code\libs\uio\utils.h +# End Source File # Begin Group "stdio" # PROP Default_Filter "" @@ -3531,7 +3539,7 @@ SOURCE=..\sc2code\units.h # End Source File # Begin Source File -SOURCE=..\sc2code\utils.c +SOURCE=..\sc2code\util.c # End Source File # Begin Source File diff --git a/sc2/src/sc2code/Makeinfo b/sc2/src/sc2code/Makeinfo index ff2c4302d..420065d87 100644 --- a/sc2/src/sc2code/Makeinfo +++ b/sc2/src/sc2code/Makeinfo @@ -8,5 +8,5 @@ uqm_CFILES="battle.c border.c build.c cleanup.c clock.c collide.c comm.c pickship.c plandata.c process.c restart.c save.c settings.c setup.c ship.c shipstat.c shipyard.c sis.c starbase.c starcon.c starmap.c state.c status.c tactrans.c - trans.c utils.c velocity.c weapon.c" + trans.c util.c velocity.c weapon.c" diff --git a/sc2/src/sc2code/utils.c b/sc2/src/sc2code/util.c similarity index 100% rename from sc2/src/sc2code/utils.c rename to sc2/src/sc2code/util.c