Changeset 211 for trunk/mediafolder/c


Ignore:
Timestamp:
Feb 14, 2025, 11:21:23 PM (6 months ago)
Author:
gyoung
Message:

Get cddb working again

Location:
trunk/mediafolder/c/cddb
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/mediafolder/c/cddb/makefile

    r156 r211  
    33include ../../../make.inc
    44
    5 CC           = icc
    6 #CPPFLAGS     = -O -Wno-write-strings -Zomf -Zcrtdll -s
     5CC           = gcc
     6CPPFLAGS     = -O -Zomf -Zcrtdll -s
    77#CPPFLAGSSTATIC     = -O -Zomf -Zsys -Zmt -s
    8 CPPFLAGS        =  /Ge+ /Gm+ /G5 /Ss /Gl /O+ /Oc+ /Ol- /Q+ /Ti /Sp4 /B"/pmtype:pm /ma /de"
    9 CPPFLAGSVAC  = /Ge- /Gm+ /G4 /Gl- /O+ /Oc+ /Ol- /Q+
     8
     9CPPFLAGSVAC  = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+
    1010INC             = ../../include
    1111MOREINC         = $(COMMONSRC)/include
    12 DEFS         =
    13 PROGS        =
     12DEFS         = 
     13PROGS        = 
    1414ODIR            = .
    1515CPPDIR  = .
    … …  
    1717BINDIR          =       ../../dist/bin
    1818HELPERDIR       =       ..\helper
    19 #TOOLDIR =      $(BUILD_ROOT)/classes/mm-progs
    20 OBJECTS         =       cddb.obj \
    21                         cd.obj \
    22                         helper.obj \
    23                         cddbhelper.obj \
    24                         message.obj
     19OBJECTS         =       cddb.o \
     20                        cd.o \
     21                        helper.o \
     22                        cddbhelper.o \
     23                        message.o
    2524LIBOBJECTS      = $(LIBDIR)/sys_funcs.obj
    2625
    … …  
    2827#all:    querycddb.exe cddbcls.obj
    2928
    30 all:     pmcddb.exe pmdb001.dll pmdb007.dll pmdb049.dll pmdb031.dll \
    31          pmdb039.dll pmdb088.dll pmdb033.dll pmdb034.dll
     29all:     pmcddb.exe pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll pmdb088.dll
    3230
    33 nlv:    pmdb001.dll pmdb007.dll pmdb049.dll pmdb031.dll \
    34         pmdb039.dll pmdb088.dll pmdb033.dll pmdb034.dll
     31nlv:    pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll pmdb088.dll
    3532
    3633pmdb001.dll:    ./res/pmcddb001.c ./res/pmcddb001.res
    … …  
    3936                cp ./res/pmcddb001.dll pmdb001.dll
    4037
    41 ./res/pmcddb001.res:    ./res/pmcddb001.rc ./res/pmcddb001.dlg $(INC)/pmcddbres.h
    42                 cd ./Res && make
    43 
    44 pmdb007.dll:    ./res/pmcddb007.c ./res/pmcddb007.res
    45                 -rm pmdb007.dll
    46                 cp ./res/pmcddb007.dll pmdb007.dll
    47 
    48 ./res/pmcddb007.res:    ./res/pmcddb007.rc ./res/pmcddb007.dlg $(INC)/pmcddbres.h
     38./res/pmcddb001.res:    ./res/pmcddb001.rc ./res/pmcddb001.dlg $(INC)/pmcddbres.h
    4939                cd ./Res && make
    5040
    … …  
    5343                cp ./res/pmcddb049.dll pmdb049.dll
    5444
    55 ./res/pmcddb049.res:    ./res/pmcddb049.rc ./res/pmcddb049.dlg $(INC)/pmcddbres.h
     45./res/pmcddb049.res:    ./res/pmcddb049.rc ./res/pmcddb049.dlg $(INC)/pmcddbres.h 
    5646                cd ./Res && make
    5747
    … …  
    6050                cp ./res/pmcddb031.dll pmdb031.dll
    6151
    62 ./res/pmcddb031.res:    ./res/pmcddb031.rc ./res/pmcddb031.dlg $(INC)/pmcddbres.h
    63                 cd ./Res && make
    64 
    65 pmdb033.dll:    ./res/pmcddb033.c ./res/pmcddb033.res
    66                 -rm pmdb033.dll
    67                 cp ./res/pmcddb033.dll pmdb033.dll
    68 
    69 ./res/pmcddb033.res:    ./res/pmcddb033.rc ./res/pmcddb033.dlg $(INC)/pmcddbres.h
    70                 cd ./Res && make
    71 
    72 pmdb034.dll:    ./res/pmcddb034.c ./res/pmcddb034.res
    73                 -rm pmdb034.dll
    74                 cp ./res/pmcddb034.dll pmdb034.dll
    75 
    76 ./res/pmcddb034.res:    ./res/pmcddb034.rc ./res/pmcddb034.dlg $(INC)/pmcddbres.h
     52./res/pmcddb031.res:    ./res/pmcddb031.rc ./res/pmcddb031.dlg $(INC)/pmcddbres.h
    7753                cd ./Res && make
    7854
    … …  
    8157                cp ./res/pmcddb039.dll pmdb039.dll
    8258
    83 ./res/pmcddb039.res:    ./res/pmcddb039.rc ./res/pmcddb039.dlg $(INC)/pmcddbres.h
     59./res/pmcddb039.res:    ./res/pmcddb039.rc ./res/pmcddb039.dlg $(INC)/pmcddbres.h 
    8460                cd ./Res && make
    8561
    … …  
    9066                cp ./res/pmcddb088.dll pmdb088.dll
    9167
    92 ./res/pmcddb088.res:    ./res/pmcddb088.rc ./res/pmcddb088.dlg $(INC)/pmcddbres.h
     68./res/pmcddb088.res:    ./res/pmcddb088.rc ./res/pmcddb088.dlg $(INC)/pmcddbres.h 
    9369                cd ./Res && make
    9470
    9571
    96 $(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
    97 #       $(CC) -c -Wall -o$@ -Zomf -I$(INC) -I$(MOREINC) $<
    98         $(CC) $(CPPFLAGS) /C+ -I$(INC) -I$(MOREINC) /Fo$@ $<
    99 cd.obj: cd.c
    100 #               gcc -c $< -I$(INC) -Zcrtdll -Zomf
    101                 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
    102 helper.obj:     helper.c
    103 #               gcc -c $< -I$(INC) -Zcrtdll -Zomf
    104                 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
    105 message.obj:    message.c
    106 #               gcc -c $< -I$(INC) -Zcrtdll -Zomf
    107                 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
     72$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c 
     73        $(CC) -c -Wall -o$@ -Zomf -I$(INC) -I$(MOREINC) $<
     74
     75cd.o:   cd.c
     76                gcc -c $< -I$(INC) -Zcrtdll -Zomf
     77
     78helper.o:       helper.c
     79                gcc -c $< -I$(INC) -Zcrtdll -Zomf
     80
     81message.o:      message.c
     82                gcc -c $< -I$(INC) -Zcrtdll -Zomf
     83
    10884pmcddb.exe:     pmcddb.cpp $(OBJECTS) $(LIBOBJECTS) $(CDDBOBJ) $(INC)\cddb.h $(INC)\cddb.hh
    109         cmd /C $(TOOLDIR)\create_def.cmd pmcddb.def
    110         $(CC) $(CPPFLAGS) -I$(INC) -I$(MOREINC) $< $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ) so32dll.lib TCPIP32.LIB pmcddb.def
     85        $(CC) $< $(CPPFLAGS) -I$(INC) -I$(MOREINC) $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ)  -lsocket -lstdc++6_dll.lib pmcddb.def
    11186
    112 cddb.obj:       cddb.cpp $(INC)\cddb.hh
    113 #               gcc -c cddb.cpp -I$(INC) -Zcrtdll -Zomf
    114                 echo $(INC)
    115                 echo $(INCLUDE)
    116                 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
    117 cddbcls.obj:    cddbcls.cpp $(INC)\cddb.hh $(INC)\cddb.h
     87cddb.o: cddb.cpp $(INC)\cddb.hh
     88                gcc -c cddb.cpp -I$(INC) -Zcrtdll -Zomf
     89
     90cddbcls.o:      cddbcls.cpp $(INC)\cddb.hh $(INC)\cddb.h
    11891                cd ../pm_launchers && make
    11992
    12093
    121 printHelper.obj:        printHelper.cpp
    122 #               gcc -c printHelper.cpp -I$(INC) -Zcrtdll -Zomf
    123                 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
    124 cddbhelper.obj: $(HELPERDIR)\cddbhelper.cpp
    125 #               gcc -c $< -I$(INC) -Zcrtdll -Zomf
    126                 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
     94printHelper.o:  printHelper.cpp
     95                gcc -c printHelper.cpp -I$(INC) -Zcrtdll -Zomf
     96
     97cddbhelper.o:   $(HELPERDIR)\cddbhelper.cpp
     98                gcc -c $< -I$(INC) -Zcrtdll -Zomf
     99
    127100clean:
    128101        -rm *.o
    129         -rm *.obj
    130102        -rm *.exe
    131103        -rm *.dll
    132         -rm *.def
    133         -rm $(LIBDIR)/*.obj
    134104        -cd ./res && make clean
    135105
    … …  
    138108
    139109       
     110

  • trunk/mediafolder/c/cddb/pmcddb.cpp

    r142 r211  
    145145  startData.FgBg=SSF_FGBG_BACK;
    146146  startData.TraceOpt=SSF_TRACEOPT_NONE;
    147   startData.PgmTitle=(char*)pszTitle;
     147  startData.PgmTitle=(PSZ)pszTitle;
    148148 
    149   startData.PgmName=(char*)"cmd.exe";
     149  startData.PgmName=(PSZ)"cmd.exe";
    150150  startData.InheritOpt=SSF_INHERTOPT_SHELL;
    151151  startData.SessionType=SSF_TYPE_WINDOWABLEVIO;
    … …  
    155155  startData.InitXSize=500;
    156156  startData.InitYSize=400;
    157   startData.ObjectBuffer=(char*)chrLoadError;
     157  startData.ObjectBuffer=(PSZ)chrLoadError;
    158158  startData.ObjectBuffLen=(ULONG)sizeof(chrLoadError);
    159159
    160160  sprintf(startParams," /C \" \"%s\" %s \"", rexxFile, parameters);
    161   startData.PgmInputs=(CHAR*)startParams;
     161  startData.PgmInputs=(PSZ)startParams;
    162162
    163163  writeLog("Trying to start ");
    … …  
    191191  sprintf(profileName,"%s\\cddb.ini", chrInstallDir);       
    192192  /* Open ini-file */
    193   hini=PrfOpenProfile(WinQueryAnchorBlock(HWND_DESKTOP),(char *)profileName);
     193  hini=PrfOpenProfile(WinQueryAnchorBlock(HWND_DESKTOP),(PCSZ)profileName);
    194194  do{
    195195    if(!hini) {
    … …  
    204204    }/* end of if(!hini) */
    205205
    206     NUMSERVERS=PrfQueryProfileInt(hini,(char*)"cddb",(char*)"numservers",0);
    207     PrfQueryProfileString(hini,(char*)"cddb",(char*)"cddbuser",(char*) "guest",username,sizeof(username));
    208     PrfQueryProfileString(hini,(char*)"cddb",(char*)"cddbuserhost",(char*) "",hostname,sizeof(hostname));
     206    NUMSERVERS=PrfQueryProfileInt(hini,(PCSZ)"cddb",(PCSZ)"numservers",0);
     207    PrfQueryProfileString(hini,(PCSZ)"cddb",(PCSZ)"cddbuser",(PCSZ) "guest",username,sizeof(username));
     208    PrfQueryProfileString(hini,(PCSZ)"cddb",(PCSZ)"cddbuserhost",(PCSZ) "",hostname,sizeof(hostname));
    209209
    210210    strncpy(version,QUERYCDDB_VERSION,sizeof(version));
    … …  
    220220      for(a=0;a<NUMSERVERS;a++) {
    221221        sprintf(text,"cddbserver%d",a+1);
    222         PrfQueryProfileString(hini,(CHAR*)"cddb",(CHAR*)text,(CHAR*)"",cddbServer[a],sizeof(cddbServer[0]));
     222        PrfQueryProfileString(hini,(PCSZ)"cddb",(PCSZ)text,(PCSZ)"",cddbServer[a],sizeof(cddbServer[0]));
    223223      }
    224224    }
    … …  
    557557  sprintf(profileName,"%s\\cddb.ini", chrInstallDir);       
    558558  /* Open ini-file */
    559   hini=PrfOpenProfile(WinQueryAnchorBlock(HWND_DESKTOP),(char *)profileName);
     559  hini=PrfOpenProfile(WinQueryAnchorBlock(HWND_DESKTOP),(PCSZ)profileName);
    560560  if(hini) {
    561561    writeLog("INI file opened.\n");
    562     PrfWriteProfileString(hini,(CHAR*)"cddb",(CHAR*)"cddbuserhost", (CHAR*)hostname);
    563     PrfWriteProfileString(hini,(CHAR*)"cddb",(CHAR*)"cddbuser",(CHAR*) username);
     562    PrfWriteProfileString(hini,(PCSZ)"cddb",(PCSZ)"cddbuserhost", (PCSZ)hostname);
     563    PrfWriteProfileString(hini,(PCSZ)"cddb",(PCSZ)"cddbuser",(PCSZ) username);
    564564    PrfCloseProfile(hini);
    565565  }/* end of if(hini) */
    … …  
    682682          writeLog("\n\n");
    683683          /* Object window creation */
    684           hwndClient=WinCreateWindow(HWND_OBJECT,WC_STATIC,(CHAR*)"cddbObject",0,0,0,0,0,NULL,HWND_BOTTOM,12343,NULL,NULL);
     684          hwndClient=WinCreateWindow(HWND_OBJECT,WC_STATIC,(PCSZ)"cddbObject",0,0,0,0,0,NULL,HWND_BOTTOM,12343,NULL,NULL);
    685685          if(hwndClient) {
    686686            WinSubclassWindow(hwndClient,&cddbObjectProc);
Note: See TracChangeset for help on using the changeset viewer.