Separate WIN64 from WIN32 build and don't try to build non-linux ttl.build-osxwin

Signed-off-by: Damien Zammit <damien@zamaudio.com>

3 files changed, 60 insertions, 11 deletions

diff --git a/dgl/Makefile.mk b/dgl/Makefile.mk
index 74829ee4..dd834ae4 100644
--- a/dgl/Makefile.mk
+++ b/dgl/Makefile.mk
@@ -14,10 +14,12 @@ CXX ?= g++
 ifneq ($(HAIKU),true)
 ifneq ($(MACOS),true)
 ifneq ($(WIN32),true)
+ifneq ($(WIN64),true)
 LINUX=true
 endif
 endif
 endif
+endif
 
 # --------------------------------------------------------------
 # Set build and link flags
@@ -45,9 +47,15 @@ BASE_OPTS  = -O2 -fdata-sections -ffunction-sections
 endif
 
 ifneq ($(WIN32),true)
+ifneq ($(WIN64),true)
 # not needed for Windows
 BASE_FLAGS += -fPIC -DPIC
 endif
+endif
+
+ifeq ($(WIN32),true)
+BASE_OPTS += -m32
+endif
 
 ifeq ($(DEBUG),true)
 BASE_FLAGS += -DDEBUG -O0 -g
@@ -124,4 +132,8 @@ ifeq ($(WIN32),true)
 DGL_LIBS  = -lopengl32 -lgdi32
 endif
 
+ifeq ($(WIN64),true)
+DGL_LIBS  = -lopengl32 -lgdi32
+endif
+
 # --------------------------------------------------------------
diff --git a/utils/generate-ttl.sh b/utils/generate-ttl.sh
index dc7de631..98d451cb 100755
--- a/utils/generate-ttl.sh
+++ b/utils/generate-ttl.sh
@@ -11,16 +11,27 @@ fi
 
 PWD=`dirname $0`
 
-if [ -f $PWD/lv2_ttl_generator.exe ]; then
-  GEN=$PWD/lv2_ttl_generator.exe
+if [ -f $PWD/lv2_ttl_generator32.exe ]; then
+  GEN=$PWD/lv2_ttl_generator32.exe
   EXT=dll
+  OSX=
+  WIN32=1
+  WIN64=
+elif [ -f $PWD/lv2_ttl_generator64.exe ]; then
+  GEN=$PWD/lv2_ttl_generator64.exe
+  EXT=dll
+  OSX=
+  WIN32=
+  WIN64=1
+elif [ -f $PWD/lv2_ttl_generatorosx ]; then
+  GEN=$PWD/lv2_ttl_generatorosx
+  EXT=dylib
+  OSX=1
+  WIN32=
+  WIN64=
 else
   GEN=$PWD/lv2_ttl_generator
-  if [ -d /Library/Audio ]; then
-    EXT=dylib
-  else
-    EXT=so
-  fi
+  EXT=so
 fi
 
 FOLDERS=`find . -type d -name \*.lv2`
@@ -28,6 +39,16 @@ FOLDERS=`find . -type d -name \*.lv2`
 for i in $FOLDERS; do
   cd $i
   FILE=`ls *.$EXT | sort | head -n 1`
-  $GEN ./$FILE
+  if [ "x$WIN64" == "x1" ]; then
+    #wine64 $GEN ./$FILE
+    echo "Not generating ttl for WIN64 yet"
+  elif [ "x$WIN32" == "x1" ]; then
+    #wine $GEN ./$FILE
+    echo "Not generating ttl for WIN32 yet"
+  elif [ "x$OSX" == "x1" ]; then
+    echo "Not generating ttl for OSX yet"
+  else
+    $GEN ./$FILE
+  fi
   cd ..
 done
diff --git a/utils/lv2-ttl-generator/GNUmakefile b/utils/lv2-ttl-generator/GNUmakefile
index 1042b7bd..dbc8f16c 100644
--- a/utils/lv2-ttl-generator/GNUmakefile
+++ b/utils/lv2-ttl-generator/GNUmakefile
@@ -3,17 +3,33 @@
 all: build
 
 ifeq ($(WIN32),true)
-build: ../lv2_ttl_generator.exe
+build: ../lv2_ttl_generator32.exe
 else
+ ifeq ($(WIN64),true)
+build: ../lv2_ttl_generator64.exe
+ else
+  ifeq ($(MACOS),true)
+build: ../lv2_ttl_generatorosx
+  else
 build: ../lv2_ttl_generator
+  endif
+ endif
 endif
 
 ../lv2_ttl_generator: lv2_ttl_generator.c
 	$(CC) $< $(CFLAGS) -o $@ $(LDFLAGS) -ldl
 
-../lv2_ttl_generator.exe: lv2_ttl_generator.c
+../lv2_ttl_generatorosx: lv2_ttl_generator.c
+	$(CC) $< $(CFLAGS) -o $@ $(LDFLAGS) -ldl
+	touch ../lv2_ttl_generator
+
+../lv2_ttl_generator32.exe: lv2_ttl_generator.c
+	$(CC) $< -m32 $(CFLAGS) -o $@ $(LDFLAGS) -static
+	touch ../lv2_ttl_generator
+
+../lv2_ttl_generator64.exe: lv2_ttl_generator.c
 	$(CC) $< $(CFLAGS) -o $@ $(LDFLAGS) -static
 	touch ../lv2_ttl_generator
 
 clean:
-	rm -f ../lv2_ttl_generator ../lv2_ttl_generator.exe
+	rm -f ../lv2_ttl_generator ../lv2_ttl_generator32.exe ../lv2_ttl_generator64.exe ../lv2_ttl_generatorosx