Changeset 109

Timestamp:

Oct 4, 2023, 6:35:52 PM (23 months ago)

Author:

gyoung

Message:

Changes from merge with Lars 2.9 branch

Location:

trunk

Files:

• classes/help/es/makefile (modified) (1 diff)
• classes/help/fr/makefile (modified) (1 diff)
• classes/help/ru/makefile (modified) (1 diff)
• mediafolder/c/cddb/res/makefile (modified) (8 diffs)
• mediafolder/c/cddb/res/pmcddb007.DEF (modified) (1 diff)
• mediafolder/c/cddb/res/pmcddb007.c (copied) (copied from branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb007.c )
• mediafolder/c/cddb/res/pmcddb007.rc (modified) (3 diffs)
• mediafolder/c/cddb/res/pmcddb049.DEF (modified) (1 diff)

trunk/classes/help/es/makefile

@@ -20 +20 @@
 
 cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
-        ipfc cwmm$(LANGUAGE).ipf        
+        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp    
 
 

trunk/classes/help/fr/makefile

@@ -20 +20 @@
 
 cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
-        ipfc cwmm$(LANGUAGE).ipf        
+        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp    
 
 

trunk/classes/help/ru/makefile

@@ -20 +20 @@
 
 cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
-        ipfc cwmm$(LANGUAGE).ipf        
+        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp
 
 

trunk/mediafolder/c/cddb/res/makefile

@@ -5 +5 @@
 CPPFLAGS  =  -Zdll -Zmt
 INC             = ../../../include
-DEFS         = 
-PROGS        =  
+DEFS         =
+PROGS        =
 ODIR            = .
 CPPDIR  = .
@@ -13 +13 @@
 
 CPPFILES        =
-all:     pmcddb001.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll pmcddb033.dll pmcddb034.dll
+all:     pmcddb001.dll pmcddb007.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll pmcddb033.dll pmcddb034.dll
 
 
@@ -20 +20 @@
                 gcc -Zdll -Zomf -I$(INC) pmcddb001.c pmcddb001.def
                 rc pmcddb001.res pmcddb001.dll
-#               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb001.def
 
-pmcddb001.res:  pmcddb001.rc pmcddb001.dlg $(INC)\pmcddbres.h 
-                rc  -i $(INC) -r pmcddb001.rc 
+pmcddb001.res:  pmcddb001.rc pmcddb001.dlg $(INC)\pmcddbres.h
+                rc  -i $(INC) -r pmcddb001.rc
 
+pmcddb007.dll:  pmcddb007.c pmcddb007.res
+                gcc -Zdll -Zomf -I$(INC) pmcddb007.c pmcddb007.def
+                rc pmcddb007.res pmcddb007.dll
 
+pmcddb007.res:  pmcddb007.rc pmcddb007.dlg $(INC)\pmcddbres.h
+                rc  -i $(INC) -r pmcddb007.rc
+                
 pmcddb049.dll:  pmcddb049.c pmcddb049.res
                 gcc -Zdll -Zomf -I$(INC) pmcddb049.c pmcddb049.def
                 rc pmcddb049.res pmcddb049.dll
 
-pmcddb049.res:  pmcddb049.rc pmcddb049.dlg $(INC)\pmcddbres.h 
-                rc  -i $(INC) -r pmcddb049.rc 
+pmcddb049.res:  pmcddb049.rc pmcddb049.dlg $(INC)\pmcddbres.h
+                rc  -i $(INC) -r pmcddb049.rc
 
 pmcddb031.dll:  pmcddb031.c pmcddb031.res
@@ -37 +42 @@
                 rc pmcddb031.res pmcddb031.dll
 
-pmcddb031.res:  pmcddb031.rc pmcddb031.dlg $(INC)\pmcddbres.h 
-                rc  -i $(INC) -r pmcddb031.rc 
+pmcddb031.res:  pmcddb031.rc pmcddb031.dlg $(INC)\pmcddbres.h
+                rc  -i $(INC) -r pmcddb031.rc
 
 pmcddb039.dll:  pmcddb039.c pmcddb039.res
@@ -44 +49 @@
                 rc pmcddb039.res pmcddb039.dll
 
-pmcddb039.res:  pmcddb039.rc pmcddb039.dlg $(INC)\pmcddbres.h 
-                rc  -i $(INC) -r pmcddb039.rc 
+pmcddb039.res:  pmcddb039.rc pmcddb039.dlg $(INC)\pmcddbres.h
+                rc  -i $(INC) -r pmcddb039.rc
 
 pmcddb088.dll:  pmcddb088.c pmcddb088.res
@@ -51 +56 @@
                 rc pmcddb088.res pmcddb088.dll
 
-pmcddb088.res:  pmcddb088.rc pmcddb039.dlg $(INC)\pmcddbres.h 
-                rc  -i $(INC) -r pmcddb088.rc 
+pmcddb088.res:  pmcddb088.rc pmcddb039.dlg $(INC)\pmcddbres.h
+                rc  -i $(INC) -r pmcddb088.rc
 
 pmcddb033.dll:  pmcddb033.c pmcddb033.res
@@ -58 +63 @@
                 rc pmcddb033.res pmcddb033.dll
 
-pmcddb033.res:  pmcddb033.rc pmcddb033.dlg $(INC)\pmcddbres.h 
-                rc  -i $(INC) -r pmcddb033.rc 
+pmcddb033.res:  pmcddb033.rc pmcddb033.dlg $(INC)\pmcddbres.h
+                rc  -i $(INC) -r pmcddb033.rc
 
 pmcddb034.dll:  pmcddb034.c pmcddb034.res
@@ -65 +70 @@
                 rc pmcddb034.res pmcddb034.dll
 
-pmcddb034.res:  pmcddb034.rc pmcddb034.dlg $(INC)\pmcddbres.h 
-                rc  -i $(INC) -r pmcddb034.rc 
+pmcddb034.res:  pmcddb034.rc pmcddb034.dlg $(INC)\pmcddbres.h
+                rc  -i $(INC) -r pmcddb034.rc
 
 clean:

trunk/mediafolder/c/cddb/res/pmcddb007.DEF

@@ -20 +20 @@
 
 LIBRARY PMDB007 INITINSTANCE TERMINSTANCE
-DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB001.DLL)#@##1## 12.05.2002 18:17:00      ;-)  ::::1::@@Resource-DLL'
+DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB007.DLL)#@##1## 12.05.2002 18:17:00      ;-)  ::::1::@@Resource-DLL'
 DATA MULTIPLE NONSHARED
 EXPORTS

trunk/mediafolder/c/cddb/res/pmcddb007.rc

@@ -1 @@
-; .rc: Resource file 
+; .rc: Resource file
 ;
 ;                    (C) Chris Wohlgemuth 1999-2002
@@ -34 +34 @@
 
 IDSTR_INIFILEOPENWARNING  "à¥€ã¯à¥Š€¥­š¥! ¥ 〠ñâáï ®âªàëâì INI-ä ©« (cddb.ini)!"
-IDSTR_PMCDDBTITLE         "‡ ¯à®á FreeDB"  
+IDSTR_PMCDDBTITLE         "‡ ¯à®á FreeDB"
 
 IDSTR_USAGE               "ˆá¯®«ì§ã©â¥ á«¥€ãîéãî ®¯æšî €«ï ­ áâனªš í«¥ªâà®­­®© ¯®çâë: /C <€€à¥á E-mail>"
@@ -40 +40 @@
 END
 
-RCINCLUDE "pmcddb001.dlg"
+RCINCLUDE "pmcddb007.dlg"
 

trunk/mediafolder/c/cddb/res/pmcddb049.DEF

@@ -19 +19 @@
 
 LIBRARY PMDB049 INITINSTANCE TERMINSTANCE
-DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB001.DLL)#@##1## 12.05.2002 18:17:00      My ;-)  ::::1::@@Resource-DLL'
+DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB049.DLL)#@##1## 12.05.2002 18:17:00      My ;-)  ::::1::@@Resource-DLL'
 DATA MULTIPLE NONSHARED
 EXPORTS