TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Some suggestions on how to improve 20_panda.prc

Browse Source 
- `win-origin -2 -2`
- Prefer OpenAL over FMOD in default audio selection
- Copy over `model-cache-dir` from makepanda's default prc
This commit is contained in:
Sam Edwards 2019-04-15 02:27:42 -06:00
parent b3f5c38ef3
commit a0f9068da8
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/configfiles/CMakeLists.txt
View File

@ -15,10 +15,10 @@ endif()
if(HAVE_RAD_MSS) if(HAVE_RAD_MSS)
set(AUDIO_LIBRARY_NAME p3miles_audio) set(AUDIO_LIBRARY_NAME p3miles_audio)
elseif(HAVE_FMODEX)
set(AUDIO_LIBRARY_NAME p3fmod_audio)
elseif(HAVE_OPENAL) elseif(HAVE_OPENAL)
set(AUDIO_LIBRARY_NAME p3openal_audio) set(AUDIO_LIBRARY_NAME p3openal_audio)
elseif(HAVE_FMODEX)
set(AUDIO_LIBRARY_NAME p3fmod_audio)
else() else()
set(AUDIO_LIBRARY_NAME none) set(AUDIO_LIBRARY_NAME none)
endif() endif()

14
panda/src/configfiles/panda.prc.in
View File

@ -1,12 +1,3 @@
//
// panda.prc.in
//
// This file defines the script to auto-generate panda.prc at
// CMake time. This is intended to fill in some of the default
// parameters, in particular the default display types.
//
#output 20_panda.prc notouch
#### Generated automatically by CMake ${CMAKE_VERSION} from panda.prc.in. #### Generated automatically by CMake ${CMAKE_VERSION} from panda.prc.in.
################################# DO NOT EDIT ########################### ################################# DO NOT EDIT ###########################
@ -16,6 +7,7 @@ model-path $THIS_PRC_DIR/../share/panda3d/models
# Let's set up a default window size of 800x600. The user can # Let's set up a default window size of 800x600. The user can
# override this in his or her personal prc file. # override this in his or her personal prc file.
win-origin -2 -2
win-size 800 600 win-size 800 600
# Define the display types that have been compiled in. Panda will # Define the display types that have been compiled in. Panda will
@ -42,6 +34,10 @@ audio-library-name ${AUDIO_LIBRARY_NAME}
load-file-type egg pandaegg load-file-type egg pandaegg
default-model-extension .egg default-model-extension .egg
# Enable the model-cache, but only for models, not textures.
model-cache-dir $XDG_CACHE_HOME/panda3d
model-cache-textures #f
# These entries work very similar to load-file-type, except they are # These entries work very similar to load-file-type, except they are
# used by the MovieVideo and MovieAudio code to determine which module # used by the MovieVideo and MovieAudio code to determine which module