updated templates and regenerated project files for OpenGL samples

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

diff --git a/samples/opengl/cube/cube.dsp b/samples/opengl/cube/cube.dsp
index a55e2258ff0d7945cb79ec77c5aa5e01dc650da6..2b8e3a74e70efc1390e892bac246883956ca30c3 100644 (file)
--- a/samples/opengl/cube/cube.dsp
+++ b/samples/opengl/cube/cube.dsp
@@ -8,12 +8,12 @@ CFG=glcube - 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 "cube.mak".
+!MESSAGE NMAKE /f "cube/cube.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 "cube.mak" CFG="glcube - Win32 Debug"
+!MESSAGE NMAKE /f "cube/cube.mak" CFG="glcube - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

diff --git a/samples/opengl/cube/cube.pro b/samples/opengl/cube/cube.pro
index fa852e50a7cc54fe2b3be3a9990b69c113384664..65320a9369ced5a3fbdd71d44711553d45377e13 100644 (file)
--- a/samples/opengl/cube/cube.pro
+++ b/samples/opengl/cube/cube.pro
@@ -15,6 +15,9 @@ CONFIG  = wx
 # not the default "../.." for this sample
 WXDIR=../../..
 
+# need to link against OpenGL libs, of course
+win32:LIBS=opengl32.lib glu32.lib
+
 # project files
 SOURCES = cube.cpp
 RC_FILE = cube.rc

diff --git a/samples/opengl/isosurf/isosurf.dsp b/samples/opengl/isosurf/isosurf.dsp
index dab0164800a892074566e7344a65702bbae42c16..b9385fc9624720c933d85a0687f59f68d8b52e08 100644 (file)
--- a/samples/opengl/isosurf/isosurf.dsp
+++ b/samples/opengl/isosurf/isosurf.dsp
@@ -8,12 +8,12 @@ CFG=glisosurf - 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 "isosurf.mak".
+!MESSAGE NMAKE /f "isosurf/isosurf.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 "isosurf.mak" CFG="glisosurf - Win32 Debug"
+!MESSAGE NMAKE /f "isosurf/isosurf.mak" CFG="glisosurf - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

diff --git a/samples/opengl/isosurf/isosurf.pro b/samples/opengl/isosurf/isosurf.pro
index bb731088d20f418e96772d65c1a8187c8481595b..1f39cce9a24521290e2679c902cf09c0891db579 100644 (file)
--- a/samples/opengl/isosurf/isosurf.pro
+++ b/samples/opengl/isosurf/isosurf.pro
@@ -15,6 +15,9 @@ CONFIG  = wx
 # not the default "../.." for this sample
 WXDIR=../../..
 
+# need to link against OpenGL libs, of course
+win32:LIBS=opengl32.lib glu32.lib
+
 # project files
 SOURCES = isosurf.cpp
 RC_FILE = isosurf.rc

diff --git a/samples/opengl/penguin/penguin.dsp b/samples/opengl/penguin/penguin.dsp
index 3a7131d489724e2fb7bc01cce59393ba7f1b9207..8a5c3d7d267c7c311173e23c5dccd8fcdfdcd9f6 100644 (file)
--- a/samples/opengl/penguin/penguin.dsp
+++ b/samples/opengl/penguin/penguin.dsp
@@ -8,12 +8,12 @@ CFG=glpenguin - 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 "penguin.mak".
+!MESSAGE NMAKE /f "penguin/penguin.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 "penguin.mak" CFG="glpenguin - Win32 Debug"
+!MESSAGE NMAKE /f "penguin/penguin.mak" CFG="glpenguin - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -144,11 +144,19 @@ LINK32=link.exe
 # Name "glpenguin - Win32 Debug"
 # Begin Source File
 
+SOURCE=.\lw.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\penguin.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=.\penguin.rc
 # End Source File
+# Begin Source File
+
+SOURCE=.\trackball.c
+# End Source File
 # End Target
 # End Project

diff --git a/samples/opengl/penguin/penguin.pro b/samples/opengl/penguin/penguin.pro
index 321d8c71244494ac04593665a8f25b1d7753e117..7fbe7da08358cea0d274e28d9dbf5ea7ad182571 100644 (file)
--- a/samples/opengl/penguin/penguin.pro
+++ b/samples/opengl/penguin/penguin.pro
@@ -15,7 +15,10 @@ CONFIG  = wx
 # not the default "../.." for this sample
 WXDIR=../../..
 
+# need to link against OpenGL libs, of course
+win32:LIBS=opengl32.lib glu32.lib
+
 # project files
-SOURCES = penguin.cpp
+SOURCES = penguin.cpp lw.cpp trackball.c
 RC_FILE = penguin.rc
 TARGET  = glpenguin