1. wxLoad/SaveFileSelector return "wxString" instead of "char *"

[wxWidgets.git] / utils / wxMMedia / makefile.nt

diff --git a/utils/wxMMedia/makefile.nt b/utils/wxMMedia/makefile.nt
index bc22ab08cab65dfe399cf05476326351937d28d2..6c7808adb9b797478db1f052cdff5bc0edcc7bb2 100644 (file)
--- a/utils/wxMMedia/makefile.nt
+++ b/utils/wxMMedia/makefile.nt
@@ -9,9 +9,7 @@
 # Makefile : Builds wxSock library for Windows NT / Win95
 
 # Change WXDIR or WXWIN to wherever wxWindows is found
 # Makefile : Builds wxSock library for Windows NT / Win95
 
 # Change WXDIR or WXWIN to wherever wxWindows is found

-#WXWIN = $(WX)
-WXDIR = $(WXWIN)
-!include $(WXWIN)\src\ntwxwin.mak
+!include <..\..\src\ntwxwin.mak>

 
 WXMMEDDIR = $(WXDIR)\utils\wxmmedia
 WXMMEDINC = $(WXMMEDDIR)
 
 WXMMEDDIR = $(WXDIR)\utils\wxmmedia
 WXMMEDINC = $(WXMMEDDIR)


@@ -24,7 +22,7 @@ LIBS=$(WXSOCKLIB) $(LIBS)
 #LIBS=$(WXLIB) $(WXSTRINGLIB) oldnames libw llibcew llibce commdlg shell
 
 OBJECTS = mmdata.obj mmfile.obj sndfile.obj sndsnd.obj sndwin.obj\
 #LIBS=$(WXLIB) $(WXSTRINGLIB) oldnames libw llibcew llibce commdlg shell
 
 OBJECTS = mmdata.obj mmfile.obj sndfile.obj sndsnd.obj sndwin.obj\

-       sndwav.obj sndfrag.obj vidbdrv.obj
+       sndwav.obj sndfrag.obj vidbase.obj

 
 all: $(WXMMEDLIB)
 
 
 all: $(WXMMEDLIB)
 


@@ -43,44 +41,44 @@ $(WXMMEDLIB): $(OBJECTS)
 $(OBJECTS)
 <<
 
 $(OBJECTS)
 <<
 

-MMD_data.obj: MMD_data.$(SRCSUFF)
+MMdata.obj: MMdata.$(SRCSUFF)

         cl @<<
         cl @<<

-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)

 <<
 
 <<
 

-MMD_file.obj: MMD_file.$(SRCSUFF)
+MMfile.obj: MMfile.$(SRCSUFF)

         cl @<<
         cl @<<

-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)

 <<
 
 <<
 

-SND_file.obj: SND_file.$(SRCSUFF) SND_file.h
+SNDfile.obj: SNDfile.$(SRCSUFF) SNDfile.h

         cl @<<
         cl @<<

-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)

 <<
 
 <<
 

-SND_wav.obj: SND_wav.$(SRCSUFF) SCK_wav.h
+SNDwav.obj: SNDwav.$(SRCSUFF) SNDwav.h

         cl @<<
         cl @<<

-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)

 <<
 
 <<
 

-SND_sound.obj: SND_sound.$(SRCSUFF) SND_sound.h
+SNDwin.obj: SNDwin.$(SRCSUFF) SNDwin.h

         cl @<<
         cl @<<

-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)

 <<
 
 <<
 

-SND_sound.obj: SND_sound.$(SRCSUFF) SND_sound.h
+SNDsnd.obj: SNDsnd.$(SRCSUFF) SNDsnd.h

         cl @<<
         cl @<<

-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)

 <<
 
 <<
 

-SND_frag.obj: SND_frag.$(SRCSUFF) SND_frag.h
+SNDfrag.obj: SNDfrag.$(SRCSUFF) SNDfrag.h

         cl @<<
         cl @<<

-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)

 <<
 
 <<
 

-VID_bdrv.obj: VID_bdrv.$(SRCSUFF) VID_bdrv.h
+VIDbase.obj: VIDbase.$(SRCSUFF) VIDbase.h

         cl @<<
         cl @<<

-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)

 <<
 
 clean:
 <<
 
 clean: