From 2910dac85f655c9beae54b3d5c723237eda3e6f6 Mon Sep 17 00:00:00 2001 From: "Unknown (UG)" Date: Fri, 16 Oct 1998 19:28:21 +0000 Subject: [PATCH 1/1] no message git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/glcanvas/samples/isosurf/isosurf.dsp | 2 +- utils/ogl/src/ogl.dsp | 186 +++++++++++++++++++++ utils/ogl/src/ogldiag.cpp | 6 +- 3 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 utils/ogl/src/ogl.dsp diff --git a/utils/glcanvas/samples/isosurf/isosurf.dsp b/utils/glcanvas/samples/isosurf/isosurf.dsp index 24aa9aa472..f5ae3a7466 100644 --- a/utils/glcanvas/samples/isosurf/isosurf.dsp +++ b/utils/glcanvas/samples/isosurf/isosurf.dsp @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib rpcrt4.lib comctl32.lib opengl32.lib glu32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept !ENDIF diff --git a/utils/ogl/src/ogl.dsp b/utils/ogl/src/ogl.dsp new file mode 100644 index 0000000000..54425b87c9 --- /dev/null +++ b/utils/ogl/src/ogl.dsp @@ -0,0 +1,186 @@ +# Microsoft Developer Studio Project File - Name="ogl" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=ogl - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "ogl.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "ogl.mak" CFG="ogl - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ogl - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "ogl - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe + +!IF "$(CFG)" == "ogl - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\include" /I "..\..\..\include\wx\msw" /I "..\..\..\include\wx\generic" /I "..\..\..\include\wx\other" /I "..\..\..\src\png" /I "..\..\..\src\zlib" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D "__WINDOWS__" /D "STRICT" /D "PROLOGIO" /Fp"..\..\..\Release\wxWin.pch" /YX"wx\wxprec.h" /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "ogl - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gf /Gy /I "..\..\..\include" /I "..\..\..\include\wx\msw" /I "..\..\..\include\wx\generic" /I "..\..\..\include\wx\other" /I "..\..\..\src\png" /I "..\..\..\src\zlib" /D "__WXDEBUG__" /D WXDEBUG=1 /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D "__WINDOWS__" /D "STRICT" /D "PROLOGIO" /Fp"..\..\..\Debug\wxWin.pch" /YX"wx\wxprec.h" /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "ogl - Win32 Release" +# Name "ogl - Win32 Debug" +# Begin Source File + +SOURCE=.\basic.cpp +# End Source File +# Begin Source File + +SOURCE=.\basic.h +# End Source File +# Begin Source File + +SOURCE=.\basic2.cpp +# End Source File +# Begin Source File + +SOURCE=.\basicp.h +# End Source File +# Begin Source File + +SOURCE=.\bmpshape.cpp +# End Source File +# Begin Source File + +SOURCE=.\bmpshape.h +# End Source File +# Begin Source File + +SOURCE=.\canvas.cpp +# End Source File +# Begin Source File + +SOURCE=.\canvas.h +# End Source File +# Begin Source File + +SOURCE=.\composit.cpp +# End Source File +# Begin Source File + +SOURCE=.\composit.h +# End Source File +# Begin Source File + +SOURCE=.\constrnt.cpp +# End Source File +# Begin Source File + +SOURCE=.\constrnt.h +# End Source File +# Begin Source File + +SOURCE=.\divided.cpp +# End Source File +# Begin Source File + +SOURCE=.\divided.h +# End Source File +# Begin Source File + +SOURCE=.\drawn.cpp +# End Source File +# Begin Source File + +SOURCE=.\drawn.h +# End Source File +# Begin Source File + +SOURCE=.\drawnp.h +# End Source File +# Begin Source File + +SOURCE=.\lines.cpp +# End Source File +# Begin Source File + +SOURCE=.\lines.h +# End Source File +# Begin Source File + +SOURCE=.\linesp.h +# End Source File +# Begin Source File + +SOURCE=.\mfutils.cpp +# End Source File +# Begin Source File + +SOURCE=.\mfutils.h +# End Source File +# Begin Source File + +SOURCE=.\misc.cpp +# End Source File +# Begin Source File + +SOURCE=.\misc.h +# End Source File +# Begin Source File + +SOURCE=.\ogl.h +# End Source File +# Begin Source File + +SOURCE=.\ogldiag.cpp +# End Source File +# Begin Source File + +SOURCE=.\ogldiag.h +# End Source File +# End Target +# End Project diff --git a/utils/ogl/src/ogldiag.cpp b/utils/ogl/src/ogldiag.cpp index 8ca66e30e8..12d08924a8 100644 --- a/utils/ogl/src/ogldiag.cpp +++ b/utils/ogl/src/ogldiag.cpp @@ -30,11 +30,15 @@ #if wxUSE_IOSTREAMH #include +#include #else #include +#include +#ifdef _MSC_VER +using namespace std; +#endif #endif -#include #include #include #include -- 2.45.2