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

Fix prebuilt bison cxx files includes to work with CMake build

Browse Source 
Change makepanda to generate without the .yxx extension so that the include name is generated properly
This commit is contained in:
rdb 2024-08-13 00:01:35 +02:00
parent 805f36ff92
commit 712300c9f1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/dcparser/dcParser.cxx.prebuilt
View File

@ -179,7 +179,7 @@ dc_cleanup_parser() {
# endif # endif
# endif # endif
#include "dcParser.yxx.h" #include "dcParser.h"
/* Symbol kind. */ /* Symbol kind. */
enum yysymbol_kind_t enum yysymbol_kind_t
{ {

6
makepanda/makepanda.py
View File

@ -1571,9 +1571,9 @@ def CompileBison(wobj, wsrc, opts):
else: else:
exit('Could not find bison!') exit('Could not find bison!')
else: else:
oscmd(bison + ' -y -d -o'+GetOutputDir()+'/tmp/'+ifile+'.c -p '+pre+' '+wsrc) oscmd(bison + ' -y -d -o'+GetOutputDir()+'/tmp/'+ifile[:-4]+'.c -p '+pre+' '+wsrc)
CopyFile(wdstc, GetOutputDir()+"/tmp/"+ifile+".c") CopyFile(wdstc, GetOutputDir()+"/tmp/"+ifile[:-4]+".c")
CopyFile(wdsth, GetOutputDir()+"/tmp/"+ifile+".h") CopyFile(wdsth, GetOutputDir()+"/tmp/"+ifile[:-4]+".h")
# Finally, compile the generated source file. # Finally, compile the generated source file.
CompileCxx(wobj, wdstc, opts + ["FLEX"]) CompileCxx(wobj, wdstc, opts + ["FLEX"])

2
panda/src/egg/parser.cxx.prebuilt
View File

@ -253,7 +253,7 @@ eggyywarning(YYLTYPE *loc, EggParserState &state, yyscan_t scanner, const string
# endif # endif
# endif # endif
#include "parser.yxx.h" #include "parser.h"
/* Symbol kind. */ /* Symbol kind. */
enum yysymbol_kind_t enum yysymbol_kind_t
{ {