TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded HAVE_ flags from dtool_config.h generation

Browse Source
This commit is contained in:
rdb 2015-01-04 20:34:59 +01:00
parent 33ef39b7db
commit 936fa653b0
14 changed files with 25 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dtool/LocalSetup.pp
View File

@ -293,18 +293,9 @@ $[cdefine PYTHON_FRAMEWORK]
/* Define if we have RAD game tools, Miles Sound System installed. */
$[cdefine HAVE_RAD_MSS]
/* Define if we have FMODex installed. */
$[cdefine HAVE_FMODEX]
/* Define if we have OpenAL installed. */
$[cdefine HAVE_OPENAL]
/* Define if we have Freetype 2.0 or better available. */
$[cdefine HAVE_FREETYPE]
/* Define if we are using SpeedTree. */
$[cdefine HAVE_SPEEDTREE]
/* Define if we want to compile in a default font. */
$[cdefine COMPILE_IN_DEFAULT_FONT]
@ -413,9 +404,6 @@ $[cdefine HAVE_FFMPEG]
$[cdefine HAVE_SWSCALE]
$[cdefine HAVE_SWRESAMPLE]
/* Define if we have ODE installed and want to build for ODE. */
$[cdefine HAVE_ODE]
/* Define if we have AWESOMIUM installed and want to build for AWESOMIUM. */
$[cdefine HAVE_AWESOMIUM]

7
makepanda/makepanda.py
View File

@ -2037,11 +2037,8 @@ DTOOL_CONFIG=[
("HAVE_BMP", '1', '1'),
("HAVE_PNM", '1', '1'),
("HAVE_VORBIS", 'UNDEF', 'UNDEF'),
("HAVE_FMODEX", 'UNDEF', 'UNDEF'),
("HAVE_OPENAL", 'UNDEF', 'UNDEF'),
("HAVE_NVIDIACG", 'UNDEF', 'UNDEF'),
("HAVE_FREETYPE", 'UNDEF', 'UNDEF'),
("HAVE_SPEEDTREE", 'UNDEF', 'UNDEF'),
("HAVE_FFTW", 'UNDEF', 'UNDEF'),
("HAVE_OPENSSL", 'UNDEF', 'UNDEF'),
("HAVE_NET", 'UNDEF', 'UNDEF'),
@ -2053,7 +2050,6 @@ DTOOL_CONFIG=[
("HAVE_SWSCALE", 'UNDEF', 'UNDEF'),
("HAVE_SWRESAMPLE", 'UNDEF', 'UNDEF'),
("HAVE_ARTOOLKIT", 'UNDEF', 'UNDEF'),
("HAVE_ODE", 'UNDEF', 'UNDEF'),
("HAVE_OPENCV", 'UNDEF', 'UNDEF'),
("HAVE_DIRECTCAM", 'UNDEF', 'UNDEF'),
("HAVE_SQUISH", 'UNDEF', 'UNDEF'),
@ -3126,6 +3122,9 @@ if (not RUNTIME):
TargetAdd('p3mathutil_composite1.obj', opts=OPTS, input='p3mathutil_composite1.cxx')
TargetAdd('p3mathutil_composite2.obj', opts=OPTS, input='p3mathutil_composite2.cxx')
IGATEFILES=GetDirectoryContents('panda/src/mathutil', ["*.h", "*_composite*.cxx"])
for ifile in IGATEFILES[:]:
if "_src." in ifile:
IGATEFILES.remove(ifile)
TargetAdd('libp3mathutil.in', opts=OPTS, input=IGATEFILES)
TargetAdd('libp3mathutil.in', opts=['IMOD:panda3d.core', 'ILIB:libp3mathutil', 'SRCDIR:panda/src/mathutil'])
TargetAdd('libp3mathutil_igate.obj', input='libp3mathutil.in', opts=["DEPENDENCYONLY"])

4
makepanda/makepandacore.py
View File

@ -525,9 +525,9 @@ def oscmd(cmd, ignoreError = False):
if "interrogate" in cmd.split(" ", 1)[0] and GetVerbose():
print(ColorText("red", "Interrogate failed, retrieving debug output..."))
if sys.platform == "win32":
os.spawnl(os.P_WAIT, exe, cmd.split(" ", 1)[0] + " -v " + cmd.split(" ", 1)[1])
os.spawnl(os.P_WAIT, exe, cmd.split(" ", 1)[0] + " -vv " + cmd.split(" ", 1)[1])
else:
os.system(cmd.split(" ", 1)[0] + " -v " + cmd.split(" ", 1)[1])
os.system(cmd.split(" ", 1)[0] + " -vv " + cmd.split(" ", 1)[1])
exit("The following command returned a non-zero value: " + str(cmd))
return res

4
panda/src/audiotraits/config_openalAudio.cxx
View File

@ -13,8 +13,6 @@
////////////////////////////////////////////////////////////////////
#include "pandabase.h"
#ifdef HAVE_OPENAL //[
#include "config_openalAudio.h"
#include "openalAudioManager.h"
@ -65,5 +63,3 @@ get_audio_manager_func_openal_audio() {
init_libOpenALAudio();
return &Create_OpenALAudioManager;
}
#endif //]

3
panda/src/audiotraits/config_openalAudio.h
View File

@ -17,7 +17,6 @@
#include "pandabase.h"
#ifdef HAVE_OPENAL //[
#include "notifyCategoryProxy.h"
#include "dconfig.h"
#include "audioManager.h"
@ -28,6 +27,4 @@ NotifyCategoryDecl(openalAudio, EXPCL_OPENAL_AUDIO, EXPTP_OPENAL_AUDIO);
extern EXPCL_OPENAL_AUDIO void init_libOpenALAudio();
extern "C" EXPCL_OPENAL_AUDIO Create_AudioManager_proc *get_audio_manager_func_openal_audio();
#endif //]
#endif // CONFIG_OPENALAUDIO_H

4
panda/src/audiotraits/fmodAudioManager.cxx
View File

@ -20,8 +20,6 @@
#include "config_fmodAudio.h"
#include "dcast.h"
#ifdef HAVE_FMODEX //[
//Panda headers.
#include "config_audio.h"
#include "config_util.h"
@ -897,5 +895,3 @@ get_cache_limit() const {
//return _cache_limit;
return 0;
}
#endif //]

4
panda/src/audiotraits/fmodAudioManager.h
View File

@ -76,8 +76,6 @@
#include "pandabase.h"
#include "pset.h"
#ifdef HAVE_FMODEX //[
#include "audioManager.h"
//The Includes needed for FMOD
@ -235,6 +233,4 @@ private:
EXPCL_FMOD_AUDIO AudioManager *Create_FmodAudioManager();
#endif //]
#endif /* __FMOD_AUDIO_MANAGER_H__ */

5
panda/src/audiotraits/fmodAudioSound.cxx
View File

@ -19,8 +19,6 @@
#include "pandabase.h"
#include "dcast.h"
#ifdef HAVE_FMODEX //[
//Panda Headers
#include "config_audio.h"
#include "config_fmodAudio.h"
@ -1107,6 +1105,3 @@ seek_callback(void *handle, unsigned int pos, void *user_data) {
return FMOD_OK;
}
}
#endif //]

11
panda/src/audiotraits/fmodAudioSound.h
View File

@ -66,15 +66,11 @@
//
////////////////////////////////////////////////////////////////////
#ifndef __FMOD_AUDIO_SOUND_H__
#define __FMOD_AUDIO_SOUND_H__
#include <pandabase.h>
#ifdef HAVE_FMODEX //[
#include "audioSound.h"
#include "reMutex.h"
#include "fmodAudioManager.h"
@ -257,11 +253,4 @@ class EXPCL_FMOD_AUDIO FmodAudioSound : public AudioSound {
#include "fmodAudioSound.I"
#endif //]
#endif /* __FMOD_AUDIO_SOUND_H__ */

1
panda/src/audiotraits/fmod_audio_composite1.cxx
View File

@ -2,4 +2,3 @@
#include "config_fmodAudio.cxx"
#include "fmodAudioManager.cxx"
#include "fmodAudioSound.cxx"

4
panda/src/audiotraits/openalAudioManager.cxx
View File

@ -15,8 +15,6 @@
#include "pandabase.h"
#ifdef HAVE_OPENAL //[
//Panda headers.
#include "config_audio.h"
#include "config_util.h"
@ -1109,5 +1107,3 @@ discard_excess_cache(int sample_limit) {
delete sd;
}
}
#endif //]

6
panda/src/audiotraits/openalAudioManager.h
View File

@ -18,7 +18,6 @@
#define __OPENAL_AUDIO_MANAGER_H__
#include "pandabase.h"
#ifdef HAVE_OPENAL //[
#include "audioManager.h"
#include "plist.h"
@ -46,8 +45,8 @@ class EXPCL_OPENAL_AUDIO OpenALAudioManager : public AudioManager {
friend class OpenALAudioSound;
friend class OpenALSoundData;
public:
public:
//Constructor and Destructor
OpenALAudioManager();
virtual ~OpenALAudioManager();
@ -247,7 +246,4 @@ private:
EXPCL_OPENAL_AUDIO AudioManager *Create_OpenALAudioManager();
#endif //]
#endif /* __OPENAL_AUDIO_MANAGER_H__ */

4
panda/src/audiotraits/openalAudioSound.cxx
View File

@ -15,8 +15,6 @@
#include "pandabase.h"
#ifdef HAVE_OPENAL //[
//Panda Headers
#include "throw_event.h"
#include "openalAudioSound.h"
@ -916,5 +914,3 @@ status() const {
return AudioSound::PLAYING;
}
}
#endif //]

6
panda/src/audiotraits/openalAudioSound.h
View File

@ -13,15 +13,11 @@
//
////////////////////////////////////////////////////////////////////
#ifndef __OPENAL_AUDIO_SOUND_H__
#define __OPENAL_AUDIO_SOUND_H__
#include "pandabase.h"
#ifdef HAVE_OPENAL //[
#include "audioSound.h"
#include "movieAudioCursor.h"
#include "trueClock.h"
@ -232,6 +228,4 @@ private:
#include "openalAudioSound.I"
#endif //]
#endif /* __OPENAL_AUDIO_SOUND_H__ */