plib-cvs Mailing List for PLIB (Page 39)
Brought to you by:
sjbaker
Menu
▾
▴
plib-cvs — A read-only list that automatically announces CVS activity
You can subscribe to this list here.
| 2002 |
Jan
(25) |
Feb
(10) |
Mar
(60) |
Apr
(49) |
May
(54) |
Jun
(94) |
Jul
(82) |
Aug
(251) |
Sep
(366) |
Oct
(17) |
Nov
(20) |
Dec
(14) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(12) |
Feb
(8) |
Mar
(2) |
Apr
(4) |
May
(5) |
Jun
(8) |
Jul
(23) |
Aug
(8) |
Sep
(7) |
Oct
(5) |
Nov
(20) |
Dec
(20) |
| 2004 |
Jan
(19) |
Feb
(70) |
Mar
(108) |
Apr
(24) |
May
(6) |
Jun
(5) |
Jul
|
Aug
(8) |
Sep
(18) |
Oct
(27) |
Nov
|
Dec
(13) |
| 2005 |
Jan
(19) |
Feb
(13) |
Mar
(1) |
Apr
|
May
(10) |
Jun
(1) |
Jul
(10) |
Aug
(5) |
Sep
(2) |
Oct
(2) |
Nov
(6) |
Dec
(4) |
| 2006 |
Jan
(9) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Sebastian U. <ud...@us...> - 2002-08-31 20:43:47
|
Update of /cvsroot/plib/plib In directory usw-pr-cvs1:/tmp/cvs-serv25089 Modified Files: Makefile.am Added Files: plibconfig.h.in Log Message: Introduced plibconfig.h --- NEW FILE: plibconfig.h.in --- /* If defined, PUI does not use GLUT (highly experimental) */ #undef PU_NOT_USING_GLUT /* If defined, PUI uses the freeglut library */ #undef PU_USING_FREEGLUT /* If defined, PUI uses the GLUT library */ #undef PU_USING_GLUT /* Define if build system is a Windows box */ #undef WIN32 /* socklen_t definition (if not defined by OS) */ #undef socklen_t Index: Makefile.am =================================================================== RCS file: /cvsroot/plib/plib/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile.am 31 Aug 2002 16:59:39 -0000 1.6 +++ Makefile.am 31 Aug 2002 20:43:43 -0000 1.7 @@ -1,3 +1,5 @@ +include_HEADERS = plibconfig.h + SUBDIRS = src EXTRA_DIST = KNOWN_BUGS NOTICE README README.win32 \ |
|
From: Wolfram K. <wol...@us...> - 2002-08-31 18:22:37
|
Update of /cvsroot/plib/plib/src/js In directory usw-pr-cvs1:/tmp/cvs-serv24768 Modified Files: js.dsp Log Message: The custom build step is now file-specific instead of project specific. Now, js.h really gets copied. Index: js.dsp =================================================================== RCS file: /cvsroot/plib/plib/src/js/js.dsp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- js.dsp 6 Jun 2002 21:15:27 -0000 1.12 +++ js.dsp 31 Aug 2002 18:21:09 -0000 1.13 @@ -41,7 +41,7 @@ # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\util" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\util" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -51,11 +51,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy Library to plib directory -PostBuild_Cmds=copy js.h ..\..\js.h -# End Special Build Tool !ELSEIF "$(CFG)" == "js - Win32 Debug" @@ -70,7 +65,7 @@ # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "..\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -80,11 +75,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"Debug\js_d.lib" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy Library to plib directory -PostBuild_Cmds=copy js.h ..\..\js.h -# End Special Build Tool !ENDIF @@ -95,6 +85,33 @@ # Begin Source File SOURCE=.\js.h + +!IF "$(CFG)" == "js - Win32 Release" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - 'js' gets installed +ProjDir=. +InputPath=.\js.h + +"$(ProjDir)\..\..\js.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(ProjDir)\js.h $(ProjDir)\..\..\js.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "js - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - 'js' gets installed +ProjDir=. +InputPath=.\js.h + +"$(ProjDir)\..\..\js.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(ProjDir)\js.h $(ProjDir)\..\..\js.h + +# End Custom Build + +!ENDIF + # End Source File # End Target # End Project |
|
From: Sebastian U. <ud...@us...> - 2002-08-31 17:19:00
|
Update of /cvsroot/plib/plib/tools In directory usw-pr-cvs1:/tmp/cvs-serv9590 Modified Files: Makefile.am Log Message: Made EXTRA_DIST up-to-date Index: Makefile.am =================================================================== RCS file: /cvsroot/plib/plib/tools/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 8 May 2002 21:24:25 -0000 1.2 +++ Makefile.am 31 Aug 2002 17:18:58 -0000 1.3 @@ -1,6 +1,6 @@ SUBDIRS = src -EXTRA_DIST = autogen.sh README NOTICE tools.dsw +EXTRA_DIST = autogen.sh README tools.dsw dist-hook: tar cf - doc \ |
|
From: Sebastian U. <ud...@us...> - 2002-08-31 17:17:22
|
Update of /cvsroot/plib/plib/demos/ttt3d/src
In directory usw-pr-cvs1:/tmp/cvs-serv9240
Modified Files:
Makefile.am
Log Message:
Made EXTRA_DIST up-to-date
Index: Makefile.am
===================================================================
RCS file: /cvsroot/plib/plib/demos/ttt3d/src/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am 20 Jun 2001 05:40:10 -0000 1.1
+++ Makefile.am 31 Aug 2002 17:17:19 -0000 1.2
@@ -10,5 +10,3 @@
p3d.h gfx.h gui.h material.h status.h sound.h \
cell.h puzzle.h level.h game.h
-INCLUDES = -I/usr/local/plib/include
-
|
|
From: Sebastian U. <ud...@us...> - 2002-08-31 17:14:56
|
Update of /cvsroot/plib/plib/demos/ttt3d In directory usw-pr-cvs1:/tmp/cvs-serv8657 Modified Files: Makefile.am Log Message: Made EXTRA_DIST up-to-date Index: Makefile.am =================================================================== RCS file: /cvsroot/plib/plib/demos/ttt3d/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 8 May 2002 21:24:24 -0000 1.3 +++ Makefile.am 31 Aug 2002 17:14:53 -0000 1.4 @@ -1,4 +1,4 @@ SUBDIRS = src wavs images data mods fonts doc -EXTRA_DIST = autogen.sh README CHANGES acinclude.m4 TTT3D.dsw TTT3D.dsp +EXTRA_DIST = autogen.sh README acinclude.m4 TTT3D.dsw TTT3D.dsp |
|
From: Sebastian U. <ud...@us...> - 2002-08-31 17:13:18
|
Update of /cvsroot/plib/plib/demos/exposer In directory usw-pr-cvs1:/tmp/cvs-serv8270 Modified Files: Makefile.am Log Message: Made EXTRA_DIST up-to-date Index: Makefile.am =================================================================== RCS file: /cvsroot/plib/plib/demos/exposer/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 8 May 2002 21:24:24 -0000 1.3 +++ Makefile.am 31 Aug 2002 17:13:15 -0000 1.4 @@ -1,4 +1,4 @@ SUBDIRS = src data doc -EXTRA_DIST = autogen.sh README CHANGES exposer.dsw +EXTRA_DIST = autogen.sh README exposer.dsw |
|
From: Sebastian U. <ud...@us...> - 2002-08-31 17:12:09
|
Update of /cvsroot/plib/plib/examples In directory usw-pr-cvs1:/tmp/cvs-serv8073 Modified Files: Makefile.am Log Message: Made EXTRA_DIST up-to-date Index: Makefile.am =================================================================== RCS file: /cvsroot/plib/plib/examples/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile.am 8 May 2002 21:24:24 -0000 1.6 +++ Makefile.am 31 Aug 2002 17:12:06 -0000 1.7 @@ -1,7 +1,6 @@ SUBDIRS = src -EXTRA_DIST = autogen.sh README CHANGES NOTICE plib_examples.dsp \ - plib_examples.dsw +EXTRA_DIST = README COPYING.DATA plib_examples.dsp plib_examples.dsw dist-hook: tar cf - doc \ |
|
From: Sebastian U. <ud...@us...> - 2002-08-31 17:07:38
|
Update of /cvsroot/plib/plib/src/sl In directory usw-pr-cvs1:/tmp/cvs-serv6949 Modified Files: Makefile.am Log Message: Made EXTRA_DIST up-to-date Index: Makefile.am =================================================================== RCS file: /cvsroot/plib/plib/src/sl/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 30 Aug 2002 18:48:18 -0000 1.8 +++ Makefile.am 31 Aug 2002 17:07:35 -0000 1.9 @@ -16,7 +16,5 @@ endif -EXTRA_DIST = README.freebsd README.linux \ - README.openbsd README.sgi README.unix README.win \ - sl.dsp +EXTRA_DIST = sl.dsp |
|
From: Sebastian U. <ud...@us...> - 2002-08-31 16:59:43
|
Update of /cvsroot/plib/plib
In directory usw-pr-cvs1:/tmp/cvs-serv4899
Modified Files:
Makefile.am
Log Message:
Fixed typo
Index: Makefile.am
===================================================================
RCS file: /cvsroot/plib/plib/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am 31 Aug 2002 15:24:18 -0000 1.5
+++ Makefile.am 31 Aug 2002 16:59:39 -0000 1.6
@@ -1,6 +1,6 @@
SUBDIRS = src
-EXTRA_DIST = KNOWN_BUGS NOTIC README README.win32 \
+EXTRA_DIST = KNOWN_BUGS NOTICE README README.win32 \
README.mac TODO-1.6 TODO-2.0 \
TODO_AFTER135 TODO_TILL135 autogen.sh \
plib.dsp plib.dsw transferCvs2WebSite
|
|
From: Steve B. <sj...@us...> - 2002-08-31 16:44:16
|
Update of /cvsroot/plib/plib/examples/src/ssg/water In directory usw-pr-cvs1:/tmp/cvs-serv1528/plib/examples/src/ssg/water Modified Files: water.cxx Log Message: Fixed texture enable/disable when multitexture is not available. Index: water.cxx =================================================================== RCS file: /cvsroot/plib/plib/examples/src/ssg/water/water.cxx,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- water.cxx 30 Aug 2002 13:11:11 -0000 1.21 +++ water.cxx 31 Aug 2002 16:44:12 -0000 1.22 @@ -89,8 +89,8 @@ glTexGeni ( GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ) ; glEnable ( GL_TEXTURE_GEN_S ) ; glEnable ( GL_TEXTURE_GEN_T ) ; - glEnable ( GL_TEXTURE_2D ) ; #ifdef GL_ARB_multitexture + glEnable ( GL_TEXTURE_2D ) ; /* Enables the second texture map. */ glBindTexture ( GL_TEXTURE_2D, tx ) ; glActiveTextureARB ( GL_TEXTURE0_ARB ) ; #endif @@ -104,8 +104,8 @@ #endif glDisable ( GL_TEXTURE_GEN_S ) ; glDisable ( GL_TEXTURE_GEN_T ) ; - glDisable ( GL_TEXTURE_2D ) ; #ifdef GL_ARB_multitexture + glDisable ( GL_TEXTURE_2D ) ; /* Disables the second texture map */ glActiveTextureARB ( GL_TEXTURE0_ARB ) ; #endif return TRUE ; |
|
From: Sebastian U. <ud...@us...> - 2002-08-31 15:24:21
|
Update of /cvsroot/plib/plib In directory usw-pr-cvs1:/tmp/cvs-serv16917 Modified Files: Makefile.am Log Message: Made EXTRA_DIST up-to-date Index: Makefile.am =================================================================== RCS file: /cvsroot/plib/plib/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.am 21 Jul 2001 16:53:15 -0000 1.4 +++ Makefile.am 31 Aug 2002 15:24:18 -0000 1.5 @@ -1,6 +1,7 @@ SUBDIRS = src -EXTRA_DIST = README README.win32 README.mac \ - CHANGES LICENSE NOTICE acsite.m4 \ - plib.dsp plib.dsw +EXTRA_DIST = KNOWN_BUGS NOTIC README README.win32 \ + README.mac TODO-1.6 TODO-2.0 \ + TODO_AFTER135 TODO_TILL135 autogen.sh \ + plib.dsp plib.dsw transferCvs2WebSite |
|
From: Sebastian U. <ud...@us...> - 2002-08-31 15:13:30
|
Update of /cvsroot/plib/plib In directory usw-pr-cvs1:/tmp/cvs-serv14258 Removed Files: LICENSE Log Message: Removed LICENSE file from PLIB top-level directory --- LICENSE DELETED --- |
|
From: Sebastian U. <ud...@us...> - 2002-08-31 14:55:20
|
Update of /cvsroot/plib/plib/examples/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv10824
Modified Files:
PointPicker.cxx complex.cxx widget_list.cxx
Log Message:
Changed to use default PUI fonts; Made some stuff "static"
Index: PointPicker.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/PointPicker.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- PointPicker.cxx 30 Aug 2002 21:11:21 -0000 1.13
+++ PointPicker.cxx 31 Aug 2002 14:55:16 -0000 1.14
@@ -37,17 +37,17 @@
* *
\***********************************/
-int main_window ;
-puText *instruction ;
-puInput *point_no ;
-puOneShot *move_point ;
-puButton *exit_button ;
-puLargeInput *input ;
+static int main_window ;
+static puText *instruction ;
[...87 lines suppressed...]
-void exit_cb ( puObject * )
+static void exit_cb ( puObject * )
{
fprintf ( stderr, "Exiting PUI demo program.\n" ) ;
exit ( 1 ) ;
@@ -336,10 +336,10 @@
// Set up the font
- tim = new fntTexFont ;
- tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
- puFont times_medium ( tim, 15, 0.3f ) ;
- puSetDefaultFonts ( times_medium, times_medium ) ;
+ //tim = new fntTexFont ;
+ //tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
+ //puFont times_medium ( tim, 15, 0.3f ) ;
+ //puSetDefaultFonts ( times_medium, times_medium ) ;
puSetDefaultStyle ( PUSTYLE_SMALL_SHADED ) ;
puSetDefaultColourScheme ( 0.1f, 0.8f, 0.1f, 1.0f) ;
Index: complex.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/complex.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- complex.cxx 15 Aug 2002 00:35:36 -0000 1.19
+++ complex.cxx 31 Aug 2002 14:55:16 -0000 1.20
@@ -20,31 +20,30 @@
* *
\***********************************/
-int main_window ;
-puMenuBar *main_menu_bar ;
-puButton *hide_menu_button ;
-puDialogBox *dialog_box ;
-puText *dialog_box_message ;
-puOneShot *dialog_box_ok_button ;
-puText *timer_text ;
-puGroup *mygroup ;
[...233 lines suppressed...]
//load the texture for the save window
- hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
- tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
+ //hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
+ //tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
// Coordinate Selection Window
@@ -560,8 +559,8 @@
glutReshapeFunc ( coordreshapefn ) ;
//load the texture for the 2nd window
- hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
- tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
+ //hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
+ //tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
puGroup *coordinate_group = new puGroup ( 0, 0 ) ; // Necessary so that "groupdisplayfn" will draw all widgets
Index: widget_list.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/widget_list.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- widget_list.cxx 30 Aug 2002 18:52:09 -0000 1.12
+++ widget_list.cxx 31 Aug 2002 14:55:16 -0000 1.13
@@ -22,70 +22,70 @@
* *
\***********************************/
-int main_window ;
+static int main_window ;
-int button_box_window ;
-puButtonBox *button_box ;
+static int button_box_window ;
+static puButtonBox *button_box ;
[...304 lines suppressed...]
large_input = new puLargeInput ( 10, 10, 240, 180, 2, 20 ) ;
large_input->setLabel ( "Label" ) ;
@@ -611,7 +611,7 @@
glutPassiveMotionFunc ( motionfn ) ;
#endif
- tim -> load ( "../fnt/data/old/times_bold.txf" ) ;
+ //tim -> load ( "../fnt/data/old/times_bold.txf" ) ;
char *combo_box_entries [] = { "First Entry", "Second Entry", "Third Entry", "Fourth Entry", "Sixth Entry", "Seventh Entry", NULL } ;
combo_box = new puComboBox ( 10, 158, 250, 190,
@@ -633,7 +633,7 @@
glutPassiveMotionFunc ( motionfn ) ;
#endif
- tim -> load ( "../fnt/data/old/times_bold.txf" ) ;
+ //tim -> load ( "../fnt/data/old/times_bold.txf" ) ;
glEnable ( GL_BLEND ) ;
glAlphaFunc ( GL_GEQUAL, 0.1f ) ;
|
|
From: Wolfram K. <wol...@us...> - 2002-08-31 13:52:03
|
Update of /cvsroot/plib/plib/tools/src/af2rgb In directory usw-pr-cvs1:/tmp/cvs-serv28354 Modified Files: af2rgb.dsp Log Message: Linking to sg, ssg, and opengl32. Single threaded -> multi threaded Index: af2rgb.dsp =================================================================== RCS file: /cvsroot/plib/plib/tools/src/af2rgb/af2rgb.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- af2rgb.dsp 22 Jun 2001 23:01:10 -0000 1.6 +++ af2rgb.dsp 31 Aug 2002 13:51:01 -0000 1.7 @@ -1,24 +1,24 @@ # Microsoft Developer Studio Project File - Name="af2rgb" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** +# ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=af2rgb - Win32 Debug -!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE -!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl +!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 "af2rgb.mak". !MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: +!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 "af2rgb.mak" CFG="af2rgb - Win32 Debug" !MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: +!MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "af2rgb - Win32 Release" (basierend auf "Win32 (x86) Console Application") -!MESSAGE "af2rgb - Win32 Debug" (basierend auf "Win32 (x86) Console Application") +!MESSAGE "af2rgb - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "af2rgb - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -39,9 +39,10 @@ # 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 "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" @@ -50,7 +51,7 @@ # 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 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:console /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 ul.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\\" +# 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 sg.lib ssg.lib ul.lib opengl32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\\" !ELSEIF "$(CFG)" == "af2rgb - Win32 Debug" @@ -66,7 +67,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" @@ -75,7 +76,7 @@ # 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 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:console /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 ul.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\\" +# 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 sg_d.lib ssg_d.lib ul_d.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\\" !ENDIF |
|
From: Wolfram K. <wol...@us...> - 2002-08-31 13:50:36
|
Update of /cvsroot/plib/plib/tools/src/af2rgb
In directory usw-pr-cvs1:/tmp/cvs-serv27975
Modified Files:
af2rgb.cxx
Log Message:
Linking additional libs means I no longer need the ugly hack I added yesterday.
Index: af2rgb.cxx
===================================================================
RCS file: /cvsroot/plib/plib/tools/src/af2rgb/af2rgb.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- af2rgb.cxx 30 Aug 2002 19:17:25 -0000 1.8
+++ af2rgb.cxx 31 Aug 2002 13:49:08 -0000 1.9
@@ -10,269 +10,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <plib/ul.h>
-//#include <plib/ssgMSFSPalette.h>
-
-// ugly hack: This is copyied from ssgLoadMDL_BGLTexture.cxx. I do not know whether we will
-// keep that file in future, so instead of linking some plib files and including some includes,
-// I opted (for now) to copy the following array:
-unsigned const char ssgFsTexPalette[1024] = {
- 0x00, 0x00, 0x00, 0xff,
- 0x08, 0x08, 0x08, 0xff,
[...239 lines suppressed...]
- 0x84, 0x9c, 0x63, 0xff,
- 0x31, 0x42, 0x29, 0xff,
- 0x63, 0xa5, 0x5a, 0xff,
- 0x4a, 0xd6, 0x4a, 0xff,
- 0x39, 0x8c, 0x39, 0xff,
- 0x4a, 0xb5, 0x4a, 0xff,
- 0x5a, 0xc6, 0x5a, 0xff,
- 0x39, 0x7b, 0x39, 0xff,
- 0x31, 0x63, 0x31, 0xff,
- 0x5a, 0xa5, 0x5a, 0xff,
- 0x52, 0x94, 0x52, 0xff,
- 0x4a, 0x63, 0x4a, 0xff,
- 0x39, 0x73, 0x84, 0xff,
- 0x21, 0x63, 0x7b, 0xff,
- 0x4a, 0x73, 0x84, 0xff
-};
+#include <plib/ssgMSFSPalette.h>
// *.?af textures are always 256 x 256:
|
|
From: Sebastian U. <ud...@us...> - 2002-08-31 13:47:39
|
Update of /cvsroot/plib/plib
In directory usw-pr-cvs1:/tmp/cvs-serv27645
Modified Files:
configure.in
Log Message:
Fix for autoconf 2.13 compatibility (thanks to Julian Foad))
Index: configure.in
===================================================================
RCS file: /cvsroot/plib/plib/configure.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- configure.in 31 Aug 2002 00:10:29 -0000 1.41
+++ configure.in 31 Aug 2002 13:47:31 -0000 1.42
@@ -393,7 +393,7 @@
glut_msg="no"
fi
-AC_MSG_NOTICE(
+AC_MSG_RESULT(
[PLIB configuration information:
Build FNT library: $enable_fnt
|
|
From: Wolfram K. <wol...@us...> - 2002-08-31 12:19:58
|
Update of /cvsroot/plib/plib/examples/src/net/net_echo In directory usw-pr-cvs1:/tmp/cvs-serv10407 Modified Files: net_echo.dsp Log Message: Single threaded -> Multi Threaded Index: net_echo.dsp =================================================================== RCS file: /cvsroot/plib/plib/examples/src/net/net_echo/net_echo.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- net_echo.dsp 25 Aug 2002 15:36:45 -0000 1.3 +++ net_echo.dsp 31 Aug 2002 12:18:51 -0000 1.4 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe |
|
From: Wolfram K. <wol...@us...> - 2002-08-31 12:19:41
|
Update of /cvsroot/plib/plib/examples/src/net/http_get In directory usw-pr-cvs1:/tmp/cvs-serv10318 Modified Files: http_get.dsp Log Message: Single threaded -> Multi Threaded Index: http_get.dsp =================================================================== RCS file: /cvsroot/plib/plib/examples/src/net/http_get/http_get.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- http_get.dsp 25 Aug 2002 15:36:45 -0000 1.3 +++ http_get.dsp 31 Aug 2002 12:18:24 -0000 1.4 @@ -13,7 +13,7 @@ !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 "http_get.mak" CFG="net_http_get - Win32 Debug" +!MESSAGE NMAKE /f "http_get.mak" CFG="http_get - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe |
|
From: Wolfram K. <wol...@us...> - 2002-08-31 12:19:25
|
Update of /cvsroot/plib/plib/examples/src/net/client_server In directory usw-pr-cvs1:/tmp/cvs-serv10182 Modified Files: net_udp_client.dsp net_udp_server.dsp Log Message: Single threaded -> Multi Threaded Index: net_udp_client.dsp =================================================================== RCS file: /cvsroot/plib/plib/examples/src/net/client_server/net_udp_client.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- net_udp_client.dsp 25 Aug 2002 15:36:45 -0000 1.4 +++ net_udp_client.dsp 31 Aug 2002 12:17:59 -0000 1.5 @@ -13,7 +13,7 @@ !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 "net_udp_client.mak" CFG="net_echo - Win32 Debug" +!MESSAGE NMAKE /f "net_udp_client.mak" CFG="net_udp_client - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe Index: net_udp_server.dsp =================================================================== RCS file: /cvsroot/plib/plib/examples/src/net/client_server/net_udp_server.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- net_udp_server.dsp 25 Aug 2002 15:36:45 -0000 1.4 +++ net_udp_server.dsp 31 Aug 2002 12:17:59 -0000 1.5 @@ -13,7 +13,7 @@ !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 "net_udp_server.mak" CFG="net_echo - Win32 Debug" +!MESSAGE NMAKE /f "net_udp_server.mak" CFG="net_udp_server - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe |
|
From: Wolfram K. <wol...@us...> - 2002-08-31 12:18:45
|
Update of /cvsroot/plib/plib/examples/src/pui In directory usw-pr-cvs1:/tmp/cvs-serv10095 Modified Files: complex.dsp Log Message: Single threaded -> Multi Threaded Index: complex.dsp =================================================================== RCS file: /cvsroot/plib/plib/examples/src/pui/complex.dsp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- complex.dsp 25 Aug 2002 15:36:45 -0000 1.14 +++ complex.dsp 31 Aug 2002 12:17:18 -0000 1.15 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe |
|
From: Wolfram K. <wol...@us...> - 2002-08-31 08:29:19
|
Update of /cvsroot/plib/plib/demos/exposer/src In directory usw-pr-cvs1:/tmp/cvs-serv32764 Modified Files: exposer.h Log Message: Change from Norman Vine: Include changes Index: exposer.h =================================================================== RCS file: /cvsroot/plib/plib/demos/exposer/src/exposer.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- exposer.h 17 Aug 2002 23:58:38 -0000 1.9 +++ exposer.h 31 Aug 2002 08:27:52 -0000 1.10 @@ -33,11 +33,8 @@ #endif #include <math.h> #include <GL/glut.h> -#include <plib/sg.h> #include <plib/pu.h> -#include <plib/ssg.h> #include <plib/ssgAux.h> -#include <plib/ul.h> #include "event.h" #include "model.h" |
|
From: Wolfram K. <wol...@us...> - 2002-08-31 08:16:06
|
Update of /cvsroot/plib/plib/demos/p-guide/src In directory usw-pr-cvs1:/tmp/cvs-serv30365 Modified Files: LoadSave.cxx pGuide.cxx StatusWindow.cxx WriteCode.cxx Log Message: Change from Norman Vine: Include changes Index: LoadSave.cxx =================================================================== RCS file: /cvsroot/plib/plib/demos/p-guide/src/LoadSave.cxx,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- LoadSave.cxx 18 Aug 2002 01:05:58 -0000 1.6 +++ LoadSave.cxx 31 Aug 2002 08:14:39 -0000 1.7 @@ -23,8 +23,6 @@ #include <stdio.h> -#include <plib/pu.h> - #include "WidgetList.h" #define TAG_SAVEFILE 0x00000001 Index: pGuide.cxx =================================================================== RCS file: /cvsroot/plib/plib/demos/p-guide/src/pGuide.cxx,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- pGuide.cxx 30 Aug 2002 14:00:17 -0000 1.9 +++ pGuide.cxx 31 Aug 2002 08:14:39 -0000 1.10 @@ -28,8 +28,6 @@ // Program to allow the user to build a PUI Graphical User Interface -#include <plib/pu.h> - #include "WidgetList.h" WidgetList *widgets = (WidgetList *)NULL ; Index: StatusWindow.cxx =================================================================== RCS file: /cvsroot/plib/plib/demos/p-guide/src/StatusWindow.cxx,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- StatusWindow.cxx 30 Aug 2002 14:00:18 -0000 1.7 +++ StatusWindow.cxx 31 Aug 2002 08:14:39 -0000 1.8 @@ -22,8 +22,6 @@ // Status Window -#include <plib/pu.h> - #include "WidgetList.h" // From the Main Window: Index: WriteCode.cxx =================================================================== RCS file: /cvsroot/plib/plib/demos/p-guide/src/WriteCode.cxx,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- WriteCode.cxx 18 Aug 2002 01:05:58 -0000 1.7 +++ WriteCode.cxx 31 Aug 2002 08:14:39 -0000 1.8 @@ -24,8 +24,6 @@ #include <stdio.h> -#include <plib/pu.h> - #include "WidgetList.h" #ifdef WIN32 |
|
From: Wolfram K. <wol...@us...> - 2002-08-31 08:08:58
|
Update of /cvsroot/plib/plib/demos/ttt3d In directory usw-pr-cvs1:/tmp/cvs-serv29201 Modified Files: TTT3D.dsp Log Message: Making it MSVC compilable: added winmm.lib Changed code generation to multithreaded Index: TTT3D.dsp =================================================================== RCS file: /cvsroot/plib/plib/demos/ttt3d/TTT3D.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- TTT3D.dsp 6 Jun 2002 23:15:24 -0000 1.5 +++ TTT3D.dsp 31 Aug 2002 08:08:02 -0000 1.6 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -50,7 +50,7 @@ # 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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib sl.lib fnt.lib pui.lib ssgAux.lib ssg.lib sg.lib ul.lib glut32.lib opengl32.lib /nologo /subsystem:console /machine:I386 /out:"TTT3D.exe" /libpath:"../../" +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib sl.lib fnt.lib pui.lib ssgAux.lib ssg.lib sg.lib ul.lib glut32.lib opengl32.lib winmm.lib /nologo /subsystem:console /machine:I386 /out:"TTT3D.exe" /libpath:"../../" !ELSEIF "$(CFG)" == "TTT3D - Win32 Debug" @@ -66,7 +66,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -74,7 +74,7 @@ # 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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib sl_d.lib fnt_d.lib pui_d.lib ssgAux_d.lib ssg_d.lib sg_d.lib ul_d.lib glut32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /out:"TTT3D.exe" /pdbtype:sept /libpath:"../../" +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib sl_d.lib fnt_d.lib pui_d.lib ssgAux_d.lib ssg_d.lib sg_d.lib ul_d.lib glut32.lib opengl32.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /out:"TTT3D.exe" /pdbtype:sept /libpath:"../../" !ENDIF |
|
From: Wolfram K. <wol...@us...> - 2002-08-31 08:07:22
|
Update of /cvsroot/plib/plib/demos/ttt3d/src In directory usw-pr-cvs1:/tmp/cvs-serv28767 Modified Files: p3d.h status.cxx ttt3d.cxx Log Message: Change from Norman Vine: Include changes Index: p3d.h =================================================================== RCS file: /cvsroot/plib/plib/demos/ttt3d/src/p3d.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- p3d.h 18 Aug 2002 00:09:46 -0000 1.3 +++ p3d.h 31 Aug 2002 08:05:49 -0000 1.4 @@ -33,10 +33,6 @@ #endif #include <math.h> -#ifdef WIN32 -#include <windows.h> -#endif - #include <plib/ssg.h> #include <GL/glut.h> Index: status.cxx =================================================================== RCS file: /cvsroot/plib/plib/demos/ttt3d/src/status.cxx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- status.cxx 18 Aug 2002 00:09:46 -0000 1.4 +++ status.cxx 31 Aug 2002 08:05:49 -0000 1.5 @@ -23,11 +23,6 @@ #include "p3d.h" -#ifdef WIN32 -#include <windows.h> -#else -#include <unistd.h> -#endif #include <stdarg.h> #define MAX_STRING 30 Index: ttt3d.cxx =================================================================== RCS file: /cvsroot/plib/plib/demos/ttt3d/src/ttt3d.cxx,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ttt3d.cxx 30 Aug 2002 14:05:59 -0000 1.5 +++ ttt3d.cxx 31 Aug 2002 08:05:49 -0000 1.6 @@ -25,7 +25,7 @@ #include "p3d.h" #include <signal.h> -#ifdef _WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) # include <io.h> # include <direct.h> |
|
From: Wolfram K. <wol...@us...> - 2002-08-31 08:05:16
|
Update of /cvsroot/plib/plib/src/fnt In directory usw-pr-cvs1:/tmp/cvs-serv28527 Modified Files: fnt.h Log Message: Change from Norman Vine: Include "sg.h" moved Index: fnt.h =================================================================== RCS file: /cvsroot/plib/plib/src/fnt/fnt.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- fnt.h 31 Aug 2002 00:06:12 -0000 1.8 +++ fnt.h 31 Aug 2002 08:04:18 -0000 1.9 @@ -25,13 +25,14 @@ #ifndef _FNT_H_ #define _FNT_H_ 1 +#include "sg.h" + #ifdef __APPLE__ # include <OpenGL/gl.h> #else # include <GL/gl.h> #endif -#include "sg.h" #define FNTMAX_CHAR 256 #define FNT_TRUE 1 |
