Browse Source

* demo is installed directly under sources so fpcdir=..
* more games for windows

peter 25 years ago
parent
commit
a6495b496a
2 changed files with 8 additions and 7 deletions
  1. 2 3
      install/demo/Makefile
  2. 6 4
      install/demo/Makefile.fpc

+ 2 - 3
install/demo/Makefile

@@ -128,7 +128,7 @@ endif
 
 # Default FPCDIR
 ifeq ($(FPCDIR),wrong)
-override FPCDIR=../..
+override FPCDIR=..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 override FPCDIR=wrong
 endif
@@ -174,7 +174,7 @@ ifeq ($(OS_TARGET),go32v2)
 override EXEOBJECTS+=mandel samegame quad maze gravwars voxel
 endif
 ifeq ($(OS_TARGET),win32)
-override EXEOBJECTS+=winhello menu mandel dlltest testdll
+override EXEOBJECTS+=mandel samegame quad maze gravwars winhello menu dlltest testdll
 endif
 
 # Clean
@@ -190,7 +190,6 @@ ZIPTARGET=install
 
 # Directories
 
-override NEEDUNITDIR=$(FPCDIR)/api
 ifndef TARGETDIR
 TARGETDIR=.
 endif

+ 6 - 4
install/demo/Makefile.fpc

@@ -5,9 +5,11 @@
 [targets]
 units=gameunit
 programs=eratos qsort hello blackbox magic lines fpctris
-programs_win32=winhello menu mandel dlltest testdll
+programs_win32=mandel samegame quad maze gravwars \
+               winhello menu dlltest testdll
 programs_linux=mandel samegame quad maze gravwars
-programs_go32v2=mandel samegame quad maze gravwars voxel
+programs_go32v2=mandel samegame quad maze gravwars \
+                voxel
 
 [require]
 # Not always necessary, but saves a lot of trouble
@@ -20,8 +22,7 @@ packagename=demo
 defaultrule=both
 
 [dirs]
-fpcdir=../..
-unitdir=$(FPCDIR)/api
+fpcdir=..
 targetdir=.
 
 [postsettings]
@@ -66,3 +67,4 @@ endif
 installexamples:
         $(MKDIR) $(EXAMPLESINSTALLDIR)
         $(COPYTREE) * $(EXAMPLESINSTALLDIR)
+