[Planeshift-cvs] CVS: planeshift/mk/mingw mingw.mak,1.29,1.30

[Matze B. <mat...@us...>]

Update of /cvsroot/planeshift/planeshift/mk/mingw
In directory usw-pr-cvs1:/tmp/cvs-serv19609/mk/mingw

Modified Files:
	mingw.mak 
Log Message:
msvc changes for mysql

Index: mingw.mak
===================================================================
RCS file: /cvsroot/planeshift/planeshift/mk/mingw/mingw.mak,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** mingw.mak	22 Feb 2002 17:21:31 -0000	1.29
--- mingw.mak	24 Feb 2002 16:45:14 -0000	1.30
***************
*** 9,13 ****
  PSGUI=psgui$(DLL)
  CLIENTRPGRULES=clientrpgrules$(DLL)
! TARGETS= $(PSSERVER) $(DBMYSQL) $(DBDUMMY) $(PSCLIENT) $(PSGUI) $(CLIENTRPGRULES)
  
  #---------
--- 9,14 ----
  PSGUI=psgui$(DLL)
  CLIENTRPGRULES=clientrpgrules$(DLL)
! PSSOUND=pssound$(DLL)
! TARGETS= $(PSSERVER) $(DBMYSQL) $(DBDUMMY) $(PSCLIENT) $(PSGUI) $(CLIENTRPGRULES) $(PSSOUND)
  
  #---------
***************
*** 37,41 ****
  #---------
  
! LIBPSNET_SRC= ./src/common/net/netbase.cpp ./src/common/net/msghandler.cpp ./src/common/net/client.cpp ./src/common/net/netthread.cpp ./src/common/net/messages.cpp ./src/common/net/timerthread.cpp
  LIBPSNET_OBJS=$(addsuffix .o, $(basename $(LIBPSNET_SRC)))
  LIBPSNET_ADDOBJS=
--- 38,42 ----
  #---------
  
! LIBPSNET_SRC= ./src/common/net/cmdhandler.cpp ./src/common/net/netbase.cpp ./src/common/net/msghandler.cpp ./src/common/net/client.cpp ./src/common/net/netthread.cpp ./src/common/net/messages.cpp ./src/common/net/timerthread.cpp
  LIBPSNET_OBJS=$(addsuffix .o, $(basename $(LIBPSNET_SRC)))
  LIBPSNET_ADDOBJS=
***************
*** 77,86 ****
  DBMYSQL_CFLAGS=-I./src/common -I./src/server 
  
! DBDUMMY_SRC=
  DBDUMMY_OBJS=$(addsuffix .o, $(basename $(DBDUMMY_SRC)))
  DBDUMMY_ADDOBJS=
  DBDUMMY_CFLAGS=-I./src/common -I./src/server 
  
! PSCLIENT_SRC= ./src/client/psengine.cpp ./src/client/psconnection.cpp ./src/client/psclientmsghandler.cpp ./src/client/authentclient.cpp ./src/client/psnetmanager.cpp ./src/client/pscelclient.cpp
  PSCLIENT_OBJS=$(addsuffix .o, $(basename $(PSCLIENT_SRC)))
  PSCLIENT_ADDOBJS= $(LIBPSNET_OBJS) $(LIBSAL_OBJS) $(LIBPSENGINE_OBJS) $(LIBPSUTIL_OBJS) $(LIBPSBEHAVE_OBJS)
--- 78,87 ----
  DBMYSQL_CFLAGS=-I./src/common -I./src/server 
  
! DBDUMMY_SRC= ./src/server/database/dummy/dummy.cpp
  DBDUMMY_OBJS=$(addsuffix .o, $(basename $(DBDUMMY_SRC)))
  DBDUMMY_ADDOBJS=
  DBDUMMY_CFLAGS=-I./src/common -I./src/server 
  
! PSCLIENT_SRC= ./src/client/psengine.cpp ./src/client/psconnection.cpp ./src/client/psclientmsghandler.cpp ./src/client/authentclient.cpp ./src/client/psnetmanager.cpp ./src/client/pscelclient.cpp ./src/client/cmdusers.cpp ./src/client/cmdguilds.cpp
  PSCLIENT_OBJS=$(addsuffix .o, $(basename $(PSCLIENT_SRC)))
  PSCLIENT_ADDOBJS= $(LIBPSNET_OBJS) $(LIBSAL_OBJS) $(LIBPSENGINE_OBJS) $(LIBPSUTIL_OBJS) $(LIBPSBEHAVE_OBJS)
***************
*** 102,105 ****
--- 103,111 ----
  CLIENTRPGRULES_CFLAGS= -I./src/common -I./src/client
  
+ PSSOUND_SRC= ./src/client/sound/pssoundmngr.cpp
+ PSSOUND_OBJS=$(addsuffix .o, $(basename $(PSSOUND_SRC)))
+ PSSOUND_ADDOBJS=
+ PSSOUND_CFLAGS=-I./src/common -I./src/client 
+ 
  
  #------
***************
*** 177,180 ****
--- 183,192 ----
  	$(DO.PLUGIN)  $(LINKFLAGS)
  
+ $(PSSOUND_OBJS): %.o : %.cpp
+ 	$(CCC) $(CXXFLAGS) $(PSSOUND_CFLAGS) -c $< -o $@
+ 
+ $(PSSOUND): $(PSSOUND_OBJS) $(PSSOUND_ADDOBJS)
+ 	$(DO.PLUGIN)  $(LINKFLAGS)
+ 
  clean:
  	$(RM) -f $(LIBPSNET_OBJS)
***************
*** 191,194 ****
--- 203,207 ----
  	$(RM) -f $(LIBGUIBASE_OBJS)
  	$(RM) -f $(CLIENTRPGRULES_OBJS)
+ 	$(RM) -f $(PSSOUND_OBJS)
  	 $(RM) -f $(TARGETS)
  
***************
*** 211,214 ****
--- 224,228 ----
  	gcc -MM $(CXXFLAGS) $(LIBGUIBASE_CFLAGS) $(LIBGUIBASE_SRC) >> makefile.dep
  	gcc -MM $(CXXFLAGS) $(CLIENTRPGRULES_CFLAGS) $(CLIENTRPGRULES_SRC) >> makefile.dep
+ 	gcc -MM $(CXXFLAGS) $(PSSOUND_CFLAGS) $(PSSOUND_SRC) >> makefile.dep
  
  #------