From ac8b1b8faf324f1bcf3c765b4d233e8413fa9272 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sat, 28 Feb 2009 15:31:46 -0500 Subject: [PATCH] Make parser generate a header, to avoid external project build confusion. --- CMakeLists.txt | 4 ++-- misc/lemon.c | 4 ++-- mojoshader_compiler.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d44a1cd5..e538690e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ ENDIF(MSVC) ADD_EXECUTABLE(lemon "misc/lemon.c") GET_TARGET_PROPERTY(LEMON lemon LOCATION) ADD_CUSTOM_COMMAND( - OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/mojoshader_parser_hlsl.c" + OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/mojoshader_parser_hlsl.h" MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/mojoshader_parser_hlsl.lemon" DEPENDS lemon "${CMAKE_CURRENT_SOURCE_DIR}/misc/lempar.c" COMMAND "${LEMON}" @@ -72,7 +72,7 @@ ADD_LIBRARY(mojoshader STATIC SET_SOURCE_FILES_PROPERTIES( mojoshader_compiler.c - PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/mojoshader_parser_hlsl.c" + PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/mojoshader_parser_hlsl.h" ) FIND_PROGRAM(RE2C re2c DOC "Path to re2c command line app: http://re2c.org/") diff --git a/misc/lemon.c b/misc/lemon.c index 09b3b5d2..7649c8b0 100644 --- a/misc/lemon.c +++ b/misc/lemon.c @@ -3611,9 +3611,9 @@ int mhflag; /* Output in makeheaders format if true */ in = tplt_open(lemp); if( in==0 ) return; #if __MOJOSHADER__ - out = file_open(lemp,".c","wb"); -#else out = file_open(lemp,".h","wb"); +#else + out = file_open(lemp,".c","wb"); #endif if( out==0 ){ fclose(in); diff --git a/mojoshader_compiler.c b/mojoshader_compiler.c index 9c91f658..9d728cd0 100644 --- a/mojoshader_compiler.c +++ b/mojoshader_compiler.c @@ -10,7 +10,7 @@ typedef struct Context } Context; #define __MOJOSHADER_HLSL_COMPILER__ 1 -#include "mojoshader_parser_hlsl.c" +#include "mojoshader_parser_hlsl.h" static int ConvertToLemonToken(const Context *ctx) {