Prechádzať zdrojové kódy

Fix prebuilt bison cxx files includes to work with CMake build

Change makepanda to generate without the .yxx extension so that the include name is generated properly
rdb 1 rok pred
rodič
commit
712300c9f1

+ 1 - 1
direct/src/dcparser/dcParser.cxx.prebuilt

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

+ 3 - 3
makepanda/makepanda.py

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

+ 1 - 1
panda/src/egg/parser.cxx.prebuilt

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