diff --git a/makefile.gaz b/makefile.gaz index 67aa0a266..21462d873 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -97,6 +97,8 @@ pad_src := pads paul_src := paul +script_src := script + sound_src := sound \ spu \ xmplay \ diff --git a/makefile.gfx b/makefile.gfx index 77d676b3d..53e58fb7d 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -275,6 +275,28 @@ GRAF_DIRS_TO_MAKE += $(MUSIC_OUT_DIR) GFX_DATA_OUT += $(MUSIC_ALL_OUT) +#---------------------------------------------------------------------------- +# Script stuff.. +#---------------------------------------------------------------------------- +SCRIPTS_IN_DIR := $(GAME_DATA_DIR)/scripts +SCRIPTS_LIST := test +SCRIPTS_IN := $(foreach SCRIPT,$(SCRIPTS_LIST),$(SCRIPTS_IN_DIR)/$(SCRIPT).scr) + +SCRIPTS_OUT_DIR := $(DATA_OUT)/scripts +SCRIPTS_OUT := $(foreach SCRIPT,$(SCRIPTS_LIST),$(SCRIPTS_OUT_DIR)/$(SCRIPT).dat) + +scripts : $(SCRIPTS_OUT) + +cleanscripts: + @$(RM) -f $(SCRIPTS_OUT) + +$(SCRIPTS_OUT) : $(SCRIPTS_IN) + @scripter $< $@ + +GRAF_DIRS_TO_MAKE += $(SCRIPTS_OUT_DIR) +GFX_DATA_OUT += $(SCRIPTS_OUT) + + #---------------------------------------------------------------------------- # Dirs to Make #---------------------------------------------------------------------------- diff --git a/source/paul/paul.cpp b/source/paul/paul.cpp index 53aa71cc5..be51bee17 100644 --- a/source/paul/paul.cpp +++ b/source/paul/paul.cpp @@ -78,8 +78,8 @@ #include "frontend\scrollbg.h" #endif -#ifndef __PAUL_SCRIPT_H__ -#include "paul\script.h" +#ifndef __SCRIPT_SCRIPT_H__ +#include "script\script.h" #endif diff --git a/source/script/script.cpp b/source/script/script.cpp index 683caddbe..b27c90b4a 100644 --- a/source/script/script.cpp +++ b/source/script/script.cpp @@ -16,7 +16,7 @@ Includes -------- */ -#include "paul\script.h" +#include "script\script.h" #ifndef __SYSTEM_DBG_H__ #include "system\dbg.h" diff --git a/source/script/script.h b/source/script/script.h index f2aae2de6..8e17e61df 100644 --- a/source/script/script.h +++ b/source/script/script.h @@ -11,8 +11,8 @@ ===========================================================================*/ -#ifndef __PAUL_SCRIPT_H__ -#define __PAUL_SCRIPT_H__ +#ifndef __SCRIPT_SCRIPT_H__ +#define __SCRIPT_SCRIPT_H__ /*---------------------------------------------------------------------- Includes @@ -129,7 +129,7 @@ private: /*---------------------------------------------------------------------- */ -#endif /* __PAUL_SCRIPT_H__ */ +#endif /* __SCRIPT_SCRIPT_H__ */ /*=========================================================================== end */ diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index a523ff69f..ea066f18a 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -380,6 +380,18 @@ SOURCE=..\..\..\source\PsxBoot\psxboot.cpp SOURCE=..\..\..\source\PsxBoot\PSXBOOT.H # End Source File # End Group +# Begin Group "script" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\source\script\script.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\script\script.h +# End Source File +# End Group # Begin Group "sound" # PROP Default_Filter ""