Changeset 4 for trunk/mediafolder/c/cddb

Timestamp:

Jul 13, 2017, 5:17:57 AM (8 years ago)

Author:

stevenhl

Message:

Import modifications from cwmm-0_2_9-work-01_10_2006.zip dated 2006-08-27

Location:

trunk/mediafolder/c/cddb

Files:

• helper.c (modified) (1 diff)
• makefile (modified) (4 diffs)
• pmcddb.cc (modified) (3 diffs)
• res/makefile (modified) (2 diffs)
• res/pmcddb049.rc (modified) (1 diff)
• res/pmcddb088.DEF (added)
• res/pmcddb088.c (added)
• res/pmcddb088.dlg (added)
• res/pmcddb088.rc (added)

trunk/mediafolder/c/cddb/helper.c

@@ -1 +1 @@
 /*
- * This file is (C) Chris Wohlgemuth 2001/2002
+ * This file is (C) Chris Wohlgemuth 2001-2005
  */
 /*

trunk/mediafolder/c/cddb/makefile

@@ -1 +1 @@
 # Makefile for Audio-CD copy
 
-CC           = icc
-LIB_DIR      = $d:/emx/lib 
-#CPPFLAGS     = -Ge- /Gm+ -G4 -Gl  /O+ -Oc+ -Ol
+include ../../../make.inc
+
+CC           = gcc
 CPPFLAGS     = -O -Zomf -Zcrtdll -s
 #CPPFLAGSSTATIC     = -O -Zomf -Zsys -Zmt -s
@@ -9 +9 @@
 CPPFLAGSVAC  = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+
 INC             = ../../include
+MOREINC         = $(COMMONSRC)/include
 DEFS         = 
 PROGS        =  
 ODIR            = .
 CPPDIR  = .
+LIBDIR          =       ./lib
 BINDIR          =       ../../dist/bin
 HELPERDIR       =       ..\helper
+OBJECTS         =       cddb.obj \
+                        cd.obj \
+                        helper.obj \
+                        cddbhelper.obj \
+                        message.obj
+LIBOBJECTS      = $(LIBDIR)/sys_funcs.obj
 
-CPPFILES        =
-OBJECTS =        cddb.obj cd.obj helper.obj cddbhelper.obj message.obj
 #printHelper.obj
 #all:    querycddb.exe cddbcls.obj
 
-all:     pmcddb.exe pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll
+all:     pmcddb.exe pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll pmdb088.dll
 
-nlv:    pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll
+nlv:    pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll pmdb088.dll 
 
 pmdb001.dll:    ./res/pmcddb001.c ./res/pmcddb001.res
@@ -53 +59 @@
                 cd ./Res && make
 
+
+
+pmdb088.dll:    ./res/pmcddb088.c ./res/pmcddb088.res
+                -rm pmdb088.dll
+                cp ./res/pmcddb088.dll pmdb088.dll
+
+./res/pmcddb088.res:    ./res/pmcddb088.rc ./res/pmcddb088.dlg $(INC)/pmcddbres.h 
+                cd ./Res && make
+
+
+$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c 
+        $(CC) -c -Wall -o$@ -Zomf -I$(INC) -I$(MOREINC) $< 
+
 cd.obj: cd.c
                 gcc -c $< -I$(INC) -Zcrtdll -Zomf
-#               cd ../. && cd helper && make
 
 helper.obj:     helper.c
@@ -63 +81 @@
                 gcc -c $< -I$(INC) -Zcrtdll -Zomf
 
-pmcddb.exe:     pmcddb.cc $(OBJECTS) $(CDDBOBJ) $(INC)\cddb.h $(INC)\cddb.hh
-        gcc $< $(CPPFLAGS) -I$(INC)   $(OBJECTS) $(CDDBOBJ)  -lsocket pmcddb.def
+pmcddb.exe:     pmcddb.cc $(OBJECTS) $(LIBOBJECTS) $(CDDBOBJ) $(INC)\cddb.h $(INC)\cddb.hh
+        $(CC) $< $(CPPFLAGS) -I$(INC) -I$(MOREINC) $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ)  -lsocket pmcddb.def
 
 cddb.obj:       cddb.cpp $(INC)\cddb.hh

trunk/mediafolder/c/cddb/pmcddb.cc

@@ -105 +105 @@
 HMODULE RESSOURCEHANDLE=0;
 
-char logName[CCHMAXPATH]="Cddb.log";
+char logName[CCHMAXPATH]=PMCDDB_LOGFILENAME;
+char logNameFullPath[CCHMAXPATH];
 
 #define QUERYCDDB_VERSION "0.1"
@@ -616 +617 @@
   /* argv[0]: progname
    * argv[1]: cd drive or /C for configuring
-   * argv[2]: REXX file
+   * argv[2]: REXX file. This file is used to parse the queried data file and
+   *          set all the info of the CD track objects.
+   *          When configuring argv[2] is the email address.
    * argv[3]: folder path
    */
 
   numArgs=argc;
-
 
   for(a=0;a<argc;a++)
@@ -632 +634 @@
     *chrPtr=0;
   strncpy(chrInstallDir, chrBinDir, sizeof(chrInstallDir)-1);
-  /*  if((chrPtr=strrchr(chrInstallDir, '\\'))!=NULLHANDLE)
-   *chrPtr=0;*/
 
   if(numArgs<3) {

trunk/mediafolder/c/cddb/res/makefile

@@ -13 +13 @@
 
 CPPFILES        =
-all:     pmcddb001.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll
+all:     pmcddb001.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll
 
 
@@ -50 +50 @@
                 rc  -i $(INC) -r pmcddb039.rc 
 
+pmcddb088.dll:  pmcddb088.c pmcddb088.res
+                gcc -Zdll -Zomf -Zno-rte -I$(INC) pmcddb088.c pmcddb088.def
+                rc pmcddb088.res pmcddb088.dll
+
+pmcddb088.res:  pmcddb088.rc pmcddb039.dlg $(INC)\pmcddbres.h 
+                rc  -i $(INC) -r pmcddb088.rc 
+
 clean:
         -rm *.obj

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

@@ -35 +35 @@
 IDSTR_PMCDDBTITLE         "FreeDB Abfrage"  
 
-IDSTR_USAGE               "Email-Adresse mit folgender Option festlegen:  /C <email address> "
+IDSTR_USAGE               "Email-Adresse mit folgender Option festlegen:  /C <Email-Adresse> "
 IDSTR_SETUPERROR         "Der Username oder der Host wurden nicht festgelegt. Pmcddb.exe mit Parameter /C starten, um die Adresse festzulegen."
 END
 
 RCINCLUDE "pmcddb049.dlg"
-