Changeset 104 for trunk/mediafolder/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)
• mediafolder/makefile (modified) (10 diffs)

trunk/mediafolder/makefile

@@ -5 +5 @@
 CC           = icc
 #CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
-CPPFLAGS     = /G5 /Ge- /Gm+ /Gl  /O+ /Ss /Oc+ /Ol- /Q+ /D$(ECS) $(VACDEBUG)
-
-
-LIBS         =  mmPM2.lib rexx.lib                 
+CPPFLAGS     = /G5 /Ge- /Gm+ /Gl- /Ga- /O+ /Ss /Oc+ /Ol- /Q+ /D$(ECS) $(VACDEBUG)
+
+
+LIBS         =  somtk.lib mmPM2.lib rexx.lib
 INC     =       ./include
 
@@ -14 +14 @@
 
 HELPERDIR       =       ./c/helper
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 CDIR            =       ./c
 IDLDIR          =       ../classes/idl
@@ -74 +74 @@
 #
 #######################################
-all:    mediafolder.dll mediafolder_en.dll mediafolder_nl.dll mediafolder_de.dll mediafolder_it.dll \
+all:    mediafld.dll mfldr_en.dll mfldr_nl.dll mfldr_de.dll mfldr_it.dll \
         ./help/mediafldr.hlp \
         prog_tutorial\mediafldrprog.inf ./c/createcd/createcd.exe
@@ -94 +94 @@
 #######################################
 #
-# Compile 
+# Compile
 #
 #######################################
@@ -117 +117 @@
 
 $(OBJDIR)/%.obj:        $(HELPERDIR)/%.cpp
-        $(COMPILE) 
+        $(COMPILE)
 
 $(HELPERDIR)/%.obj:     ./helper/%.cpp $(INC)\mediafolder.hh
         $(COMPILE)
 
-mediafolder.dll:        $(OBJECTS) progfolder\progfolder.def $(INC)\mediafolderres.h ./res/mediafolder.res
+mediafld.dll:   $(OBJECTS) progfolder\progfolder.def $(INC)\mediafolderres.h ./res/mediafolder.res
                 -cd ../. && make bld
                 @create_mfldr_def.CMD mediafolder.DEF
                 implib /NOLOGO lib\progfldr.lib progfolder\progfolder.def
-                icc -Ge- /Q+ /D$(ECS) /FM $(OBJECTS) lib\progfldr.lib $(LIBS) mediafolder.def
-                rc ./res/mediafolder.res $@ 
-                MAPSYM mediafolder
-
-mediafolder_en.dll:     
-                -cd ./res && make
-
-mediafolder_de.dll:
-                -cd ./res && make
-
-mediafolder_nl.dll:
-                -cd ./res && make
-
-mediafolder_it.dll:
+                icc -Ge- /Q+ /D$(ECS) /Fe$@ /Fm$*.map $(OBJECTS) lib/progfldr.lib $(LIBS) mediafolder.def
+                rc ./res/mediafolder.res $@
+                MAPSYM $*.map
+
+mfldr_en.dll:   
+                -cd ./res && make
+
+mfldr_de.dll:
+                -cd ./res && make
+
+mfldr_nl.dll:
+                -cd ./res && make
+
+mfldr_it.dll:
                 -cd ./res && make
 
@@ -210 +210 @@
         -mkdir ..\..\$(PKGNAME)-$(VERSION)-ger\CWMFldr-$(VERSION)-ger\FreeDB\logfiles
         -mkdir ..\..\$(PKGNAME)-$(VERSION)-ger\CWMFldr-$(VERSION)-ger\FreeDB\cddbdata
-        cp prog_tutorial/mediafldrprog.inf ../../$(PKGNAME)-$(VERSION)-ger\CWMFldr-$(VERSION)-ger\Doc\mediafldr.inf 
+        cp prog_tutorial/mediafldrprog.inf ../../$(PKGNAME)-$(VERSION)-ger\CWMFldr-$(VERSION)-ger\Doc\mediafldr.inf
         cp bin/*.cmd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/
         cp bin/*.rx ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/
         cp bin/*.dll ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/dll/
         cp ./c/createcd/createcd.exe  ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/
-        cp ./mediafolder.dll ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/mediafld.dll
-        cp ./res/obj/mediafolder_de.dll ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/mfldr_de.dll
+        cp ./mediafld.dll ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/mediafld.dll
+        cp ./res/obj/mfldr_de.dll ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/mfldr_de.dll
         cp ./help/mediafldr049.hlp ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/mediafld.hlp
         cp ./install/MFLDRGER.ins  ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/MFLDRGER.INS
@@ -242 +242 @@
         -mkdir ..\..\$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\FreeDB\logfiles
         -mkdir ..\..\$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\FreeDB\cddbdata
-        cp prog_tutorial/mediafldrprog.inf ../../$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\Doc\mediafldr.inf 
+        cp prog_tutorial/mediafldrprog.inf ../../$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\Doc\mediafldr.inf
         cp bin/*.cmd ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/
         cp bin/*.rx ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/
         cp bin/*.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/dll/
         cp ./c/createcd/createcd.exe  ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/
-        cp ./mediafolder.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.dll
-        cp ./res/obj/mediafolder_en.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mfldr_en.dll
+        cp ./mediafld.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.dll
+        cp ./res/obj/mfldr_en.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mfldr_en.dll
         cp ./help/mediafldr.hlp ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.hlp
         cp ./install/MEDIAFLD.ins  ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/MEDIAFLD.INS
@@ -269 +269 @@
         -mkdir ..\..\$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\FreeDB\logfiles
         -mkdir ..\..\$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\FreeDB\cddbdata
-        -cp prog_tutorial\mediafldrprog.inf ..\..\$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\Doc\mediafldr.inf 
+        -cp prog_tutorial\mediafldrprog.inf ..\..\$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\Doc\mediafldr.inf
         -cp doc/Readme.eng ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/
         -cp doc/FILE_ID.DIZ ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/
@@ -278 +278 @@
         -cp Skripte_eng/* ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/Skripte/
         -cp ./help/mediafldr.hlp ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.hlp
-        -cp ./mediafolder.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.dll
+        -cp ./mediafld.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.dll
         -cp ./mediafolder001.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/media001.dll
         -cp ./install/MEDIAFLD.INS  ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/
@@ -303 +303 @@
         -mkdir ..\..\$(ECSBASE)-eng\FreeDB\logfiles
         -mkdir ..\..\$(ECSBASE)-eng\FreeDB\cddbdata
-        -cp prog_tutorial/mediafldrprog.inf ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/Doc/mediafldr.inf 
+        -cp prog_tutorial/mediafldrprog.inf ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/Doc/mediafldr.inf
         -cp bin/*.cmd ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin/
         -cp bin/*.rx ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin/
         -cp bin/progfldr.dll ../../$(ECSBASE)-eng/dll/
         -cp ./help/mediafldr.hlp ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin/mediafld.hlp
-        -cp ./mediafolder.dll ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin/mediafld.dll
+        -cp ./mediafld.dll ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin/mediafld.dll
         -cp ./mediafolder001.dll ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin/media001.dll
         -cp ./install/createcd.exe  ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin