Commit 20fe4c3a authored by thomas's avatar thomas
Browse files

updated build system

fixes for Max headers

git-svn-id: https://svn.grrrr.org/ext/trunk@941 4d9ac71a-51e6-0310-8455-cad1006bcd31
parent 7d6adef0
......@@ -42,20 +42,20 @@ TARGETTYPE=single
##############################
# flext-specific make stuff
!include $(BUILDPATH)bmake-$(BUILDCLASS).inc
!include $(BUILDPATH)bmake.inc
!include $(BUILDPATH)bmake-$(BUILDCLASS).inc
##############################
# platform-specific make stuff
!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\bmake-$(COMPILER)-$(BUILDCLASS).inc
!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\bmake-$(COMPILER).inc
!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\bmake-$(COMPILER)-$(BUILDCLASS).inc
##############################
# general make stuff
!include $(BUILDPATH)$(PLATFORM)\bmake-$(COMPILER)-$(BUILDCLASS).inc
!include $(BUILDPATH)$(PLATFORM)\bmake-$(COMPILER).inc
!include $(BUILDPATH)$(PLATFORM)\bmake-$(COMPILER)-$(BUILDCLASS).inc
......@@ -42,20 +42,20 @@ endif
##############################
# flext-specific definitions
include $(BUILDPATH)gnumake-$(BUILDCLASS).inc
include $(BUILDPATH)gnumake.inc
include $(BUILDPATH)gnumake-$(BUILDCLASS).inc
##############################
# platform-specific make stuff
include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/gnumake-$(COMPILER)-$(BUILDCLASS).inc
include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/gnumake-$(COMPILER).inc
include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/gnumake-$(COMPILER)-$(BUILDCLASS).inc
##############################
# general make stuff
include $(BUILDPATH)$(PLATFORM)/gnumake-$(COMPILER)-$(BUILDCLASS).inc
include $(BUILDPATH)$(PLATFORM)/gnumake-$(COMPILER).inc
include $(BUILDPATH)$(PLATFORM)/gnumake-$(COMPILER)-$(BUILDCLASS).inc
......@@ -21,6 +21,12 @@ OUTPATH=max-darwin
# where should the external be installed?
INSTPATH=/Library/Application\ Support/Cycling\ \'74/externals/flext
# where should the initialization files be installed?
INITPATH=/Library/Application\ Support/Cycling\ \'74/init
# where should the help files be installed?
HELPPATH=/Applications/MaxMSP 4.5/max-help/flext
###############################################################
# user defined compiler flags
......
......@@ -42,20 +42,20 @@ TARGETTYPE=single
##############################
# flext-specific definitions
!include $(BUILDPATH)nmake-$(BUILDCLASS).inc
!include $(BUILDPATH)nmake.inc
!include $(BUILDPATH)nmake-$(BUILDCLASS).inc
##############################
# platform-specific make stuff
!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\nmake-$(COMPILER)-$(BUILDCLASS).inc
!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\nmake-$(COMPILER).inc
!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\nmake-$(COMPILER)-$(BUILDCLASS).inc
##############################
# general make stuff
!include $(BUILDPATH)$(PLATFORM)\nmake-$(COMPILER)-$(BUILDCLASS).inc
!include $(BUILDPATH)$(PLATFORM)\nmake-$(COMPILER).inc
!include $(BUILDPATH)$(PLATFORM)\nmake-$(COMPILER)-$(BUILDCLASS).inc
......@@ -3,27 +3,3 @@ build-default-default: build-all-all
install-default-default: install-all-all
clean-default-default: clean-all-all
###################################################
build-all-all: build-release-all build-debug-all
build-release-all: build-release-single build-release-multi build-release-shared
build-debug-all: build-debug-single build-debug-multi build-debug-shared
###################################################
install-all-all: install-release-all install-debug-all
install-release-all: install-release-single install-release-multi install-release-shared
install-debug-all: install-debug-single install-debug-multi install-debug-shared
###################################################
clean-all-all: clean-release-all clean-debug-all
clean-release-all: clean-release-single clean-release-multi clean-release-shared
clean-debug-all: clean-debug-single clean-debug-multi clean-debug-shared
......@@ -12,6 +12,48 @@ install-default-default: install-$(TARGETMODE)-$(TARGETTYPE)
clean-default-default: clean-$(TARGETMODE)-$(TARGETTYPE)
###################################################
build-all-all: build-release-all build-debug-all
build-release-all: build-release-single build-release-multi build-release-shared
build-debug-all: build-debug-single build-debug-multi build-debug-shared
build-all-single: build-release-single build-debug-single
build-all-multi: build-release-multi build-debug-multi
build-all-shared: build-release-shared build-debug-shared
###################################################
install-all-all: install-release-all install-debug-all
install-release-all: install-release-single install-release-multi install-release-shared
install-debug-all: install-debug-single install-debug-multi install-debug-shared
install-all-single: install-release-single install-debug-single
install-all-multi: install-release-multi install-debug-multi
install-all-shared: install-release-shared install-debug-shared
###################################################
clean-all-all: clean-release-all clean-debug-all
clean-release-all: clean-release-single clean-release-multi clean-release-shared
clean-debug-all: clean-debug-single clean-debug-multi clean-debug-shared
clean-all-single: clean-release-single clean-debug-single
clean-all-multi: clean-release-multi clean-debug-multi
clean-all-shared: clean-release-shared clean-debug-shared
###########################################################
build-release-single: config
......@@ -34,42 +76,42 @@ build-debug-shared: config
###########################################################
install-release-single:
install-release-single: config
$(MAKE) $(OPTIONS) _install_
install-debug-single:
install-debug-single: config
$(MAKE) $(OPTIONS) DEBUG=1 _install_
install-release-multi:
install-release-multi: config
$(MAKE) $(OPTIONS) THREADED=1 _install_
install-debug-multi:
install-debug-multi: config
$(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _install_
install-release-shared:
install-release-shared: config
$(MAKE) $(OPTIONS) SHARED=1 _install_
install-debug-shared:
install-debug-shared: config
$(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _install_
###########################################################
clean-release-single:
clean-release-single: config
$(MAKE) $(OPTIONS) _clean_
clean-debug-single:
clean-debug-single: config
$(MAKE) $(OPTIONS) DEBUG=1 _clean_
clean-release-multi:
clean-release-multi: config
$(MAKE) $(OPTIONS) THREADED=1 _clean_
clean-debug-multi:
clean-debug-multi: config
$(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _clean_
clean-release-shared:
clean-release-shared: config
$(MAKE) $(OPTIONS) SHARED=1 _clean_
clean-debug-shared:
clean-debug-shared: config
$(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _clean_
###########################################################
......
......@@ -41,9 +41,8 @@ $(TARGET) :: $(OBJS)
# remove build
_clean_:
-del /q $(TARGET) > nul
-cd $(TARGETPATH)
-del /q $(OBJS) > nul
-del /q $(TARGETPATH)\*.* > nul
-rmdir /q $(TARGETPATH) > nul
##############################################
......
......@@ -43,9 +43,8 @@ $(TARGET) :: $(OBJS)
##############################################
_clean_:
-del /q $(TARGET) > nul
-cd $(TARGETPATH)
-del /q $(OBJS) > nul
-del /q $(TARGETPATH)\*.* > nul
-rmdir /q $(TARGETPATH) > nul
##############################################
......
......@@ -32,7 +32,8 @@ $(TARGET) :: $(COBJS) $(CPPOBJS)
##############################################
_clean_:
-del $(subst /,\,$(COBJS) $(CPPOBJS) $(TARGET))
-del /q $(subst /,\,$(TARGETPATH)/*.*) > nul
-rmdir /q $(subst /,\,$(TARGETPATH)) > nul
##############################################
......
......@@ -32,7 +32,8 @@ endif
##############################################
_clean_:
-del $(subst /,\,$(COBJS) $(CPPOBJS) $(TARGET))
-del /q $(subst /,\,$(TARGETPATH)/*.*) > nul
-rmdir /q $(subst /,\,$(TARGETPATH)) > nul
##############################################
......
......@@ -2,10 +2,6 @@
# you should have the latest version!
MAXSDKPATH="c:/data/prog/audio/maxmspsdk_win/4.5 headers/c74support"
# where is MS VC++?
# (not necessary if the build is run with the compiler environment)
# MSVCPATH=C:/Programme/Microsoft Visual Studio .NET 2003/Vc7
###############################################################
# where do/should the flext headers reside/be built?
......@@ -15,7 +11,8 @@ FLEXTINC="%CommonProgramFiles%/Cycling '74/flext"
FLEXTLIB=$(FLEXTINC)
# where do/should the flext shared libraries reside/be built?
FLEXTSHLIB=$(FLEXTINC)
# (a good place is the MaxMSP program folder)
FLEXTSHLIB="%ProgramFiles%\audio\MaxMSP 4.5"
###############################################################
......@@ -26,6 +23,12 @@ OUTPATH=max-mingw
# where should the external be installed?
INSTPATH="%CommonProgramFiles%/Cycling '74/externals/flext"
# where should the initialization files be installed?
INITPATH="%CommonProgramFiles%/Cycling '74/init"
# where should the help files be installed?
HELPPATH="%ProgramFiles%/MaxMSP 4.5/max-help/flext"
###############################################################
# some user-definable flags
......
......@@ -4,7 +4,7 @@ MAXSDKPATH="c:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support"
# where is MS VC++?
# (not necessary if the build is run with the compiler environment)
# MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7
# MSVCPATH="%ProgramFiles%\Microsoft Visual Studio .NET 2003\Vc7"
###############################################################
......@@ -15,7 +15,8 @@ FLEXTINC="%CommonProgramFiles%\Cycling '74\flext"
FLEXTLIB=$(FLEXTINC)
# where do/should the flext shared libraries reside/be built?
FLEXTSHLIB=$(FLEXTINC)
# (a good place is the MaxMSP program folder)
FLEXTSHLIB="%ProgramFiles%\MaxMSP 4.5"
###############################################################
......@@ -26,6 +27,12 @@ OUTPATH=max-msvc
# where should the external be installed?
INSTPATH="%CommonProgramFiles%\Cycling '74\externals\flext"
# where should the initialization files be installed?
INITPATH="%CommonProgramFiles%\Cycling '74\init"
# where should the help files be installed?
HELPPATH="%ProgramFiles%\MaxMSP 4.5\max-help\flext"
###############################################################
# some user-definable flags
......
......@@ -32,9 +32,8 @@ $(TARGET):: $(OBJS)
# remove build
_clean_:
-del /q $(TARGET) > nul
-cd $(TARGETPATH)
-del /q $(OBJS) > nul
-del /q $(TARGETPATH)\*.* > nul
-rmdir /q $(TARGETPATH) > nul
##############################################
......
......@@ -33,9 +33,8 @@ $(TARGET):: $(OBJS)
# remove build
_clean_:
-del /q $(TARGET) > nul
-cd $(TARGETPATH)
-del /q $(OBJS) > nul
-del /q $(TARGETPATH)\*.* > nul
-rmdir /q $(TARGETPATH) > nul
##############################################
......
......@@ -22,7 +22,7 @@ CFLAGS=$(CFLAGS) /Fp$(TARGETPATH)\precompiled.pch
##############################################
# create code for DLL
CFLAGS=$(CFLAGS) /LD /GD
CFLAGS=$(CFLAGS) /LD
# enable exception handling
CFLAGS=$(CFLAGS) /GX
......
......@@ -14,7 +14,7 @@ FLEXTINC=$(PDPATH)\flext
FLEXTLIB=$(FLEXTINC)
# where do/should the flext shared libraries reside/be built?
FLEXTSHLIB=$(FLEXTINC)
FLEXTSHLIB=$(PDPATH)\bin
###############################################################
......
......@@ -118,7 +118,7 @@ extern "C" {
#include "ext.h"
#include "ext_user.h"
#if FLEXT_OS == FLEXT_OS_MAC && defined(MAC_VERSION)
#if FLEXT_OS != FLEXT_OS_MAC || defined(MAC_VERSION)
// doesn't exist for OS9
#include "ext_critical.h"
#endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment