Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (UG)
1999-01-08 10:54:10 +00:00
parent 4040a396cb
commit 6c905cb7fd
9 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/glcanvas/samples/cube/makefile.nt
View File

@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
WXUSINGDLL=0
EXTRAINC=-I..\..\win
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu.lib opengl.lib
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib
!include $(WXDIR)\src\ntwxwin.mak

2
utils/glcanvas/samples/isosurf/makefile.nt
View File

@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
WXUSINGDLL=0
EXTRAINC=-I..\..\win
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu.lib opengl.lib
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib
!include $(WXDIR)\src\ntwxwin.mak

1
utils/wxMMedia/cdbase.cpp
View File

@@ -10,6 +10,7 @@
#ifdef __GNUG__
#pragma implementation
#endif
#include "wx/wxprec.h"
#include "cdbase.h"
#ifdef __BORLANDC__

38
utils/wxMMedia/makefile.nt
View File

@@ -9,9 +9,7 @@
# 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)
@@ -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\
sndwav.obj sndfrag.obj vidbdrv.obj
sndwav.obj sndfrag.obj vidbase.obj
all: $(WXMMEDLIB)
@@ -43,44 +41,44 @@ $(WXMMEDLIB): $(OBJECTS)
$(OBJECTS)
<<
MMD_data.obj: MMD_data.$(SRCSUFF)
MMdata.obj: MMdata.$(SRCSUFF)
cl @<<
$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
<<
MMD_file.obj: MMD_file.$(SRCSUFF)
MMfile.obj: MMfile.$(SRCSUFF)
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 @<<
$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
<<
SND_wav.obj: SND_wav.$(SRCSUFF) SCK_wav.h
SNDwav.obj: SNDwav.$(SRCSUFF) SNDwav.h
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 @<<
$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
<<
SND_sound.obj: SND_sound.$(SRCSUFF) SND_sound.h
SNDsnd.obj: SNDsnd.$(SRCSUFF) SNDsnd.h
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 @<<
$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
<<
VID_bdrv.obj: VID_bdrv.$(SRCSUFF) VID_bdrv.h
VIDbase.obj: VIDbase.$(SRCSUFF) VIDbase.h
cl @<<
$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
<<
clean:

2
utils/wxMMedia/mmdata.cpp
View File

@@ -7,6 +7,8 @@
// Copyright: (C) 1997, 1998, Guilhem Lavaux
// License: wxWindows license
////////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#include "mmfile.h"
#include "sndsnd.h"

5
utils/wxMMedia/mmfile.h
View File

@@ -14,11 +14,6 @@
#pragma interface
#endif
#ifdef WX_PRECOMP
#include "wx_prec.h"
#else
#include "wx/wx.h"
#endif
#include "wx/string.h"
#include "wx/stream.h"
#include "mmtype.h"