Changeset 104 for trunk/classes/makefile

Timestamp:

Oct 2, 2023, 11:34:35 PM (23 months ago)

Author:

gyoung

Message:

Remaining changes from merge with Lars 2.9 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• classes/makefile (modified) (11 diffs)

trunk/classes/makefile

@@ -2 +2 @@
 
 include ../make.inc
-PMPRINTFPATH = U:\PMPrintf
 DISTNAME        =       cwaudio-classes-$(VERSION)
 CC           = icc
@@ -9 +8 @@
 #-Wcnd /Weff /Wini /Wpar /Wpro /Wuse /Wrea
 #CFLAGS       =    /Wuse /Wrea -Ge- /Gm+ -G4 /Ss -Gl /O+ -Oc+ -Ol- /Q+ /C
-CFLAGS       =    -Ge- /Gm+ -G4 /Ss -Gl /O+ -Oc+ -Ol- /Q+ /C 
-
-LIBS            =       somtk.lib mmPM2.lib rexx.lib $(PMPRINTFPATH)\pmprintf.lib
-DEFS            = 
+CFLAGS       =    -Ge- /Gm+ -G4 /Ss -Gl /O+ -Oc+ -Ol- /Q+ /C
+
+LIBS            =       somtk.lib mmPM2.lib rexx.lib
+DEFS            =
 
 MOREINC =       ./include -I./inc -I../common_functions/include
@@ -35 +34 @@
 #Audio classes
 AUD_SCCOMPILEC  =       sc -I $(IDLDIR)/idl_audio -I $(IDLDIR)/idl_mm -p -r -sc -d$(CDIR)/c_audio -maddstar -mnoint -S128000 -C128000  $<
-AUD_SCCOMPILEIH =       sc -I $(IDLDIR)/idl_audio -I $(IDLDIR)/idl_mm -p -r -sih";"h -dinclude -maddstar -mnoint -S128000 -C128000  $<
+AUD_SCCOMPILEIH =       sc -I $(IDLDIR)/idl_audio -I $(IDLDIR)/idl_mm -p -r -s"ih;h" -dinclude -maddstar -mnoint -S128000 -C128000  $<
 
 #Video
 VID_SCCOMPILEC  =       sc -I $(IDLDIR)/idl_video -p -r -sc -d$(CDIR)/c_video -maddstar -mnoint -S128000 -C128000  $<
-VID_SCCOMPILEIH =       sc -I $(IDLDIR)/idl_video -p -r -sih";"h -dinclude -maddstar -mnoint -S128000 -C128000  $<
+VID_SCCOMPILEIH =       sc -I $(IDLDIR)/idl_video -p -r -s"ih;h" -dinclude -maddstar -mnoint -S128000 -C128000  $<
 
 #image
 IMG_SCCOMPILEC  =       sc -I $(IDLDIR)/idl_image -p -r -sc -d$(CDIR)/c_image -maddstar -mnoint -S128000 -C128000  $<
-IMG_SCCOMPILEIH =       sc -I $(IDLDIR)/idl_image -p -r -sih";"h -dinclude -maddstar -mnoint -S128000 -C128000  $<
+IMG_SCCOMPILEIH =       sc -I $(IDLDIR)/idl_image -p -r -s"ih;h" -dinclude -maddstar -mnoint -S128000 -C128000  $<
 
 #base classes
 MM_SCCOMPILEC   =       sc -I $(IDLDIR)/idl_mm -p -r -sc -d$(CDIR)/c_mm -maddstar -mnoint -S128000 -C128000  $<
-MM_SCCOMPILEIH  =       sc -I $(IDLDIR)/idl_mm -p -r -sih";"h -dinclude -maddstar -mnoint -S128000 -C128000  $<
+MM_SCCOMPILEIH  =       sc -I $(IDLDIR)/idl_mm -p -r -s"ih;h" -dinclude -maddstar -mnoint -S128000 -C128000  $<
 
 
@@ -104 +103 @@
                         $(OBJDIR)/cwmmdisk.obj \
                         $(OBJDIR)/mmfolder.obj
- 
+
 COMMON_OBJECTS  =       $(OBJDIR)/except.obj \
                                 $(OBJDIR)/message.obj \
@@ -123 +122 @@
 HLP_FILES       =       ./Help/de/cwmm049.hlp \
                         ./Help/en/cwmm.hlp \
+                        ./Help/es/cwmm034.hlp \
+                        ./Help/fr/cwmm033.hlp \
                         ./Help/nl/cwmm031.hlp \
                         ./Help/it/cwmm039.hlp \
@@ -191 +192 @@
         cd ./res && make
         rc ./res/common_res/cwaudio.res cwmm.dll
-        MAPSYM $(basename $@)
+        MAPSYM cwmm.map
 
 ###################################
@@ -209 +210 @@
 ###################################
 # German
-./Help/de/cwmm049.hlp:  ./Help/de/cwmm049.ipf 
+./Help/de/cwmm049.hlp:  ./Help/de/cwmm049.ipf
         cd ./Help/de && make    
 
@@ -216 +217 @@
         cd ./Help/en && make
 
+# Spanish
+./Help/es/cwmm034.hlp:  ./Help/es/cwmm034.ipf
+        cd ./Help/es && make
+
+# French
+./Help/fr/cwmm033.hlp:  ./Help/fr/cwmm033.ipf
+        cd ./Help/fr && make
+
 # Dutch
 ./Help/nl/cwmm031.hlp:  ./Help/nl/cwmm031.ipf
@@ -224 +233 @@
         cd ./Help/it && make
 
-# Traditional chinese (TW)
-./Help/tw/cwmm088.hlp:  ./Help/tw/cwmm088.ipf
+# Taiwan
+./Help/tw/cwmm088.hlp:  ./Help/tw/cwmm088.ipf
         cd ./Help/tw && make
 
@@ -315 +324 @@
         -cd ./Help/de && make clean
         -cd ./Help/en && make clean
+        -cd ./Help/es && make clean
+        -cd ./Help/fr && make clean
         -cd ./Help/nl && make clean
         -cd ./Help/it && make clean
@@ -328 +339 @@
         -cd ./Help/de && make cleaner
         -cd ./Help/en && make cleaner
+        -cd ./Help/es && make cleaner
+        -cd ./Help/fr && make cleaner
         -cd ./Help/nl && make cleaner
         -cd ./Help/it && make cleaner