From b59a76bea51a584df4ab40e0fd466a9df3e1529a Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 1 May 2001 22:48:07 +0000 Subject: [PATCH] *** empty log message *** --- dtool/Config.pp | 7 +---- dtool/pptempl/Global.msvc.pp | 8 ++++-- dtool/pptempl/Template.gmsvc.pp | 9 +++++++ dtool/pptempl/Template.msvc.pp | 8 ++++-- panda/src/doc/INSTALL.txt | 47 +++++++++++++++++++++++++++++++++ 5 files changed, 69 insertions(+), 10 deletions(-) create mode 100644 panda/src/doc/INSTALL.txt diff --git a/dtool/Config.pp b/dtool/Config.pp index 055d73643b..f9a129765b 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -84,11 +84,7 @@ // control your attachment to the trees; in this case, the install // directory for each tree will by default be the root of the tree // itself (although this may be overridden). -#if $[eq $[PLATFORM],Win32] - #define INSTALL_DIR /pandadir -#else - #define INSTALL_DIR /usr/local/panda -#endif +#define INSTALL_DIR /usr/local/panda // What level of compiler optimization/debug symbols should we build? @@ -106,7 +102,6 @@ #define OPTIMIZE 2 - //////////////////////////////////////////////////////////////////// // The remaining variables are considered only if BUILD_TYPE is not // "autoconf". (Autoconf can determine these directly.) diff --git a/dtool/pptempl/Global.msvc.pp b/dtool/pptempl/Global.msvc.pp index 77c659b5c7..0fefd5d63a 100644 --- a/dtool/pptempl/Global.msvc.pp +++ b/dtool/pptempl/Global.msvc.pp @@ -143,9 +143,13 @@ #defer STATIC_LIB_C $[LIBBER] /nologo $[sources] /OUT:"$[osfilename $[target]]" #defer STATIC_LIB_C++ $[STATIC_LIB_C] -#defer ver_resource $[directory]\ver.res +#if $[GENERATE_BUILDDATE] +#defer ver_resource "$[directory]\ver.res" +#else +#define ver_resource +#endif -#defer SHARED_LIB_C $[LINKER] /nologo /dll $[LDFLAGS_OPT$[OPTIMIZE]] $[sources] "$[ver_resource]" $[decygwin %,/LIBPATH:"%",$[lpath] $[EXTRA_LIBPATH]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]] /OUT:"$[osfilename $[target]]" +#defer SHARED_LIB_C $[LINKER] /nologo /dll $[LDFLAGS_OPT$[OPTIMIZE]] $[sources] $[ver_resource] $[decygwin %,/LIBPATH:"%",$[lpath] $[EXTRA_LIBPATH]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]] /OUT:"$[osfilename $[target]]" #defer SHARED_LIB_C++ $[SHARED_LIB_C] #defer LINK_BIN_C $[LINKER] /nologo $[LDFLAGS_OPT$[OPTIMIZE]] $[sources] $[decygwin %,/LIBPATH:"%",$[lpath] $[EXTRA_LIBPATH]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]] /OUT:"$[osfilename $[target]]" diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp index 6241f7e430..abb9a78648 100644 --- a/dtool/pptempl/Template.gmsvc.pp +++ b/dtool/pptempl/Template.gmsvc.pp @@ -339,6 +339,7 @@ $[varname] = $[sources] #define tmpdirname_win $[directory]\$[mybasename] // not parallel (requires gmake 3.79) because of link.exe conflicts in TMP dir (see audiotraits dir) +#if $[GENERATE_BUILDDATE] .NOTPARALLEL $[target] : $[sources] $[so_dir]/stamp $[dtool_ver_dir_cyg]/version.rc // first generate builddate for rc compiler mkdir -p $[tmpdirname_cyg] // this dir-creation-stuff is leftover from trying to resolve parallel link difficulties @@ -350,6 +351,14 @@ $[varname] = $[sources] #else $[SHARED_LIB_C] $[VER_RESOURCE] #endif +#else +.NOTPARALLEL $[target] : $[sources] $[so_dir]/stamp + #if $[filter %.cxx %.yxx %.lxx,$[get_sources]] + $[SHARED_LIB_C++] + #else + $[SHARED_LIB_C] + #endif +#endif #if $[build_dlls] diff --git a/dtool/pptempl/Template.msvc.pp b/dtool/pptempl/Template.msvc.pp index 8085f3f66c..73e82535e4 100644 --- a/dtool/pptempl/Template.msvc.pp +++ b/dtool/pptempl/Template.msvc.pp @@ -319,12 +319,16 @@ $[osfilename $[directory]] : $[varname] = $[osfilename $[sources]] #define target $[so_dir]\lib$[TARGET]$[dllext].$[dlllib] #define sources $($[varname]) - #define flags $[get_cflags] $[C++FLAGS] $[CFLAGS_OPT$[OPTIMIZE]] $[CFLAGS_SHARED] $[building_var:%=/D%] + #define flags $[get_cflags] $[C++FLAGS] $[CFLAGS_OPT$[OPTIMIZE]] $[CFLAGS_SHARED] $[building_var:%=/D%] +#if $[GENERATE_BUILDDATE] $[target] : $[sources] "$[dtool_ver_dir]\version.rc" // first generate builddate for rc compiler cl /nologo /EP "$[dtool_ver_dir]\verdate.cpp" > "$[TEMP]\verdate.h" - rc /n /I$[TEMP] /fo"$[ver_resource]" $[filter /D%, $[flags]] "$[dtool_ver_dir]\version.rc" + rc /n /I$[TEMP] /fo$[ver_resource] $[filter /D%, $[flags]] "$[dtool_ver_dir]\version.rc" rm -f "$[dtool_ver_dir]\verdate.h" +#else +$[target] : $[sources] +#endif #if $[filter %.cxx %.yxx %.lxx,$[get_sources]] $[SHARED_LIB_C++] #else diff --git a/panda/src/doc/INSTALL.txt b/panda/src/doc/INSTALL.txt new file mode 100644 index 0000000000..d0ba646c02 --- /dev/null +++ b/panda/src/doc/INSTALL.txt @@ -0,0 +1,47 @@ +# +# Make a directory for installing Panda, e.g. c:\pandadir + +md c:\pandadir +md c:\pandadir\bin +copy ppremake.exe c:\pandadir\bin +copy cygwin1.dll c:\pandadir\bin + +# +# Put c:\pandadir\bin and c:\pandadir\lib on your path +path c:\pandadir\bin;c:\pandadir\lib;%PATH% + + +# +# Make a directory for building Panda, e.g. c:\pandadir\build +md c:\pandadir\build + +# +# Create a Config.pp file in the build directory: +edit c:\pandadir\build\Config.pp + # Some local build configuration parameters may be defined in + # this file (see Config.pp in the dtool directory). + + # For now, add the following lines: +#define INSTALL_DIR c:\pandadir + + +# +# Set up some environment variables for building and/or running: +set PANDA_ROOT=c:\ +set PPREMAKE_CONFIG=c:\pandadir\build\Config.pp + +# +# Unpack the sources +c: +cd \pandadir\build +unzip dtool.zip +unzip panda.zip + +# +# Build +cd dtool +ppremake +nmake install +cd ..\panda +ppremake +nmake install