new project file + misc fixes for wxUSE_DOC_VIEW_ARCHITECTURE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/ogl/samples/ogledit/doc.cpp b/utils/ogl/samples/ogledit/doc.cpp
index c5e9731231978de859c9d00ddb14d175736148c5..e617c7eee747046d463b54afa552eef6f2f55c26 100644 (file)
--- a/utils/ogl/samples/ogledit/doc.cpp
+++ b/utils/ogl/samples/ogledit/doc.cpp
@@ -24,7 +24,7 @@
 #include <wx/wx.h>
 #endif
 
-#if !USE_DOC_VIEW_ARCHITECTURE
+#if !wxUSE_DOC_VIEW_ARCHITECTURE
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
 #endif
 

diff --git a/utils/ogl/samples/ogledit/ogledit.cpp b/utils/ogl/samples/ogledit/ogledit.cpp
index 7e2e666e817aa3872901a38aaceeb96f9399d6d2..7aac4d1ab021e6b9192fd43f5d531d38c8a38310 100644 (file)
--- a/utils/ogl/samples/ogledit/ogledit.cpp
+++ b/utils/ogl/samples/ogledit/ogledit.cpp
@@ -24,7 +24,7 @@
 #include <wx/wx.h>
 #endif
 
-#if !USE_DOC_VIEW_ARCHITECTURE
+#if !wxUSE_DOC_VIEW_ARCHITECTURE
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
 #endif
 

diff --git a/utils/ogl/samples/ogledit/ogledit.dsp b/utils/ogl/samples/ogledit/ogledit.dsp
new file mode 100644 (file)
index 0000000..bd70475
--- /dev/null
+++ b/utils/ogl/samples/ogledit/ogledit.dsp
@@ -0,0 +1,139 @@
+# Microsoft Developer Studio Project File - Name="ogledit" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=ogledit - 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 "ogledit.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 "ogledit.mak" CFG="ogledit - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "ogledit - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "ogledit - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "ogledit - 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 Ignore_Export_Lib 0
+# 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" /I "..\..\src" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D "__WINDOWS__" /D "STRICT" /D "PROLOGIO" /Fp"..\..\..\..\Release\wxWin.pch" /YX"wx\wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0xc09 /d "NDEBUG"
+# ADD RSC /l 0xc09 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 /machine:I386
+# 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 /machine:I386
+
+!ELSEIF  "$(CFG)" == "ogledit - 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 Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /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" /I "..\..\src" /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
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0xc09 /d "_DEBUG"
+# ADD RSC /l 0xc09 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 rpcrt4.lib comctl32.lib opengl32.lib glu32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "ogledit - Win32 Release"
+# Name "ogledit - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\doc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\doc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ogledit.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ogledit.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ogledit.rc
+
+!IF  "$(CFG)" == "ogledit - Win32 Release"
+
+# ADD BASE RSC /l 0xc09
+# ADD RSC /l 0xc09 /i "..\..\..\..\include"
+
+!ELSEIF  "$(CFG)" == "ogledit - Win32 Debug"
+
+# ADD BASE RSC /l 0xc09
+# ADD RSC /l 0xc09 /i "..\..\..\..\include"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\palette.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\palette.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\view.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\view.h
+# End Source File
+# End Target
+# End Project

diff --git a/utils/ogl/samples/ogledit/view.cpp b/utils/ogl/samples/ogledit/view.cpp
index cf7a59c940c99ebfd313672284a428bfda9ebda7..701b1fce27ccfb975d3000229ce781197649afc4 100644 (file)
--- a/utils/ogl/samples/ogledit/view.cpp
+++ b/utils/ogl/samples/ogledit/view.cpp
@@ -26,7 +26,7 @@
 
 #include <wx/colordlg.h>
 
-#if !USE_DOC_VIEW_ARCHITECTURE
+#if !wxUSE_DOC_VIEW_ARCHITECTURE
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
 #endif