Changeset 127
- Timestamp:
- Oct 29, 2023, 11:05:48 PM (22 months ago)
- Location:
- trunk
- Files:
-
- 1 added
- 1 deleted
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/classes/mm-progs/mmprog.inc
r104 r127 1 1 # MM-prog specific makefile include 2 2 3 CC = gcc4 CPPFLAGS = -O -Wno-pointer-sign -Wall -Zomf -Zmt -s3 CC = icc 4 #CPPFLAGS = -O -Wno-pointer-sign -Wall -Zomf -Zmt -s 5 5 #CPPFLAGS = -O -Zomf -Zcrtdll -Zmtd -s 6 CPPFLAGS = -Ge+ /Gm+ -G5 /Ss -Gl /O+ -Oc+ -Ol- /Q+ 6 7 7 8 INC = ../include -I ../../../classes/inc -I $(COMMONSRC)/include … … 16 17 17 18 $(LIBDIR)/%.obj: $(COMMONSRC)/%.c 18 $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<19 19 # $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $< 20 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $< 20 21 %.obj: %.c 21 $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $< 22 # $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $< 23 $(CC) $(CPPFLAGS) /C -I$(INC) /Fo$@ $< 22 24 23 25 -
trunk/mediafolder/c/cddb/cddb.cpp
r104 r127 24 24 #include <io.h> 25 25 #include <fcntl.h> 26 #include <sys/types.h> 26 //#include <sys/itypes.h> 27 #include <types.h> 27 28 #include <sys/socket.h> 28 29 #include <netdb.h> 29 30 #include <errno.h> 31 #include <nerrno.h> 30 32 #include <netinet/in.h> 31 33 … … 42 44 extern int errno; 43 45 LONG extern CDDBDiscID(char * drive,CDDBINFO *cddbInfo); 44 46 //unsigned short _Optlink _bswap(unsigned short s); 45 47 extern int port; 46 48 extern char host[100]; … … 360 362 root->linkCddb(Cddb); 361 363 362 }while( true);364 }while(1); 363 365 364 366 } … … 387 389 sprintf(buffer,"cddb query %08x %d",cddbInfo->discid,cddbInfo->numTracks); 388 390 for(a=0;a<cddbInfo->numTracks;a++) { 389 rc=s nprintf(track,sizeof(track)," %d",cddbInfo->startSector[a]);391 rc=sprintf(track,/*sizeof(track),*/" %d",cddbInfo->startSector[a]); 390 392 if(rc==EOF||rc>=sizeof(track)) { 391 393 printError((char *)"Query: buffer overrun while formatting track offsets.\nPlease report this bug.\n"); … … 399 401 } 400 402 401 rc=s nprintf(track,sizeof(track)," %d\n",cddbInfo->discLength);403 rc=sprintf(track,/*sizeof(track),*/ " %d\n",cddbInfo->discLength); 402 404 if(rc==EOF||rc>=sizeof(track)) { 403 405 printError((char *)"Query: buffer overrun while formatting disclength.\nPlease report this bug.\n"); -
trunk/mediafolder/c/cddb/helper.c
r4 r127 158 158 BOOL buildLogName( char * outBuf, char * logName,ULONG ulSize) 159 159 { 160 if(s nprintf(outBuf, ulSize,"logfiles\\%s",logName)==EOF)160 if(sprintf(outBuf, /*ulSize,*/"logfiles\\%s",logName)==EOF) 161 161 return FALSE; 162 162 return TRUE; … … 510 510 { 511 511 /* Build full path for cdrecord.ini file */ 512 s nprintf(chrBuffer, iBufferSize, "%s\\cdrecord.ini", chrInstallDir);512 sprintf(chrBuffer, /*iBufferSize,*/ "%s\\cdrecord.ini", chrInstallDir); 513 513 chrBuffer[iBufferSize-1]=0; /* Always terminate with zero */ 514 514 } -
trunk/mediafolder/c/cddb/makefile
r112 r127 3 3 include ../../../make.inc 4 4 5 CC = gcc6 CPPFLAGS = -O -Wno-write-strings -Zomf -Zcrtdll -s5 CC = icc 6 #CPPFLAGS = -O -Wno-write-strings -Zomf -Zcrtdll -s 7 7 #CPPFLAGSSTATIC = -O -Zomf -Zsys -Zmt -s 8 8 CPPFLAGS = /Ge+ /Gm+ /G5 /Ss /Gl /O+ /Oc+ /Ol- /Q+ /Ti /Gx- /Sp4 /B"/pmtype:pm /ma /De" 9 9 CPPFLAGSVAC = /Ge- /Gm+ /G4 /Gl- /O+ /Oc+ /Ol- /Q+ 10 10 INC = ../../include … … 17 17 BINDIR = ../../dist/bin 18 18 HELPERDIR = ..\helper 19 OBJECTS = cddb.o \20 cd.o \21 helper.o \22 cddbhelper.o \23 message.o 19 OBJECTS = cddb.obj \ 20 cd.obj \ 21 helper.obj \ 22 cddbhelper.obj \ 23 message.obj 24 24 LIBOBJECTS = $(LIBDIR)/sys_funcs.obj 25 25 … … 71 71 72 72 $(LIBDIR)/%.obj: $(COMMONSRC)/%.c 73 $(CC) -c -Wall -o$@ -Zomf -I$(INC) -I$(MOREINC) $< 73 # $(CC) -c -Wall -o$@ -Zomf -I$(INC) -I$(MOREINC) $< 74 $(CC) $(CPPFLAGS) /C+ -I$(INC) -I$(MOREINC) /Fo$@ $< 75 cd.obj: cd.c 76 # gcc -c $< -I$(INC) -Zcrtdll -Zomf 77 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $< 78 helper.obj: helper.c 79 # gcc -c $< -I$(INC) -Zcrtdll -Zomf 80 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $< 81 message.obj: message.c 82 # gcc -c $< -I$(INC) -Zcrtdll -Zomf 83 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $< 84 pmcddb.exe: pmcddb.cpp $(OBJECTS) $(LIBOBJECTS) $(CDDBOBJ) $(INC)\cddb.h $(INC)\cddb.hh 85 $(CC) $(CPPFLAGS) -I$(INC) -I$(MOREINC) $< $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ) so32dll.lib TCPIP32.LIB pmcddb.def 74 86 75 cd.o: cd.c 76 gcc -c $< -I$(INC) -Zcrtdll -Zomf 77 78 helper.o: helper.c 79 gcc -c $< -I$(INC) -Zcrtdll -Zomf 80 81 message.o: message.c 82 gcc -c $< -I$(INC) -Zcrtdll -Zomf 83 84 pmcddb.exe: pmcddb.cc $(OBJECTS) $(LIBOBJECTS) $(CDDBOBJ) $(INC)\cddb.h $(INC)\cddb.hh 85 $(CC) $< $(CPPFLAGS) -I$(INC) -I$(MOREINC) $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ) -lsocket -lstdc++6_dll.lib pmcddb.def 86 87 cddb.o: cddb.cpp $(INC)\cddb.hh 88 gcc -c cddb.cpp -I$(INC) -Zcrtdll -Zomf 89 90 cddbcls.o: cddbcls.cpp $(INC)\cddb.hh $(INC)\cddb.h 87 cddb.obj: cddb.cpp $(INC)\cddb.hh 88 # gcc -c cddb.cpp -I$(INC) -Zcrtdll -Zomf 89 echo $(INC) 90 echo $(INCLUDE) 91 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $< 92 cddbcls.obj: cddbcls.cpp $(INC)\cddb.hh $(INC)\cddb.h 91 93 cd ../pm_launchers && make 92 94 93 95 94 printHelper.o : printHelper.cpp95 gcc -c printHelper.cpp -I$(INC) -Zcrtdll -Zomf96 97 cddbhelper.o : $(HELPERDIR)\cddbhelper.cpp98 gcc -c $< -I$(INC) -Zcrtdll -Zomf99 96 printHelper.obj: printHelper.cpp 97 # gcc -c printHelper.cpp -I$(INC) -Zcrtdll -Zomf 98 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $< 99 cddbhelper.obj: $(HELPERDIR)\cddbhelper.cpp 100 # gcc -c $< -I$(INC) -Zcrtdll -Zomf 101 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $< 100 102 clean: 101 103 -rm *.obj -
trunk/mediafolder/c/cddb/message.c
r2 r127 3 3 #include <os2.h> 4 4 #include <stdio.h> 5 6 void errorResource(void); 5 7 6 8 void errorResource() -
trunk/mediafolder/c/cddb/pmcddb.DEF
r43 r127 21 21 NAME PmCddb WINDOWAPI 22 22 DESCRIPTION '$@#(c) Chris Wohlgemuth :V0.1 (05.03.2000) ()#@' 23 STACKSIZE 1638400 23 24 24 25 25 -
trunk/mediafolder/c/cddb/res/makefile
r109 r127 2 2 3 3 CC = icc 4 #CPPFLAGSVAC = /Ge- /Gm+ /G4 /Gl /O+ /Oc+ /Ol- /Q+4 CPPFLAGSVAC = /Ge- /Gm+ /G4 /Gl /O+ /Oc+ /Ol- /Q+ 5 5 CPPFLAGS = -Zdll -Zmt 6 6 INC = ../../../include … … 18 18 19 19 pmcddb001.dll: pmcddb001.c pmcddb001.res 20 gcc -Zdll -Zomf -I$(INC) pmcddb001.c pmcddb001.def 20 # gcc -Zdll -Zomf -I$(INC) pmcddb001.c pmcddb001.def 21 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb001.c pmcddb001.def 21 22 rc pmcddb001.res pmcddb001.dll 22 23 … … 25 26 26 27 pmcddb007.dll: pmcddb007.c pmcddb007.res 27 gcc -Zdll -Zomf -I$(INC) pmcddb007.c pmcddb007.def 28 # gcc -Zdll -Zomf -I$(INC) pmcddb007.c pmcddb007.def 29 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb007.c pmcddb007.def 28 30 rc pmcddb007.res pmcddb007.dll 29 31 … … 32 34 33 35 pmcddb049.dll: pmcddb049.c pmcddb049.res 34 gcc -Zdll -Zomf -I$(INC) pmcddb049.c pmcddb049.def 36 # gcc -Zdll -Zomf -I$(INC) pmcddb049.c pmcddb049.def 37 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb049.c pmcddb049.def 35 38 rc pmcddb049.res pmcddb049.dll 36 39 … … 39 42 40 43 pmcddb031.dll: pmcddb031.c pmcddb031.res 41 gcc -Zdll -Zomf -I$(INC) pmcddb031.c pmcddb031.def 44 # gcc -Zdll -Zomf -I$(INC) pmcddb031.c pmcddb031.def 45 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb031.c pmcddb031.def 42 46 rc pmcddb031.res pmcddb031.dll 43 47 … … 46 50 47 51 pmcddb039.dll: pmcddb039.c pmcddb039.res 48 gcc -Zdll -Zomf -I$(INC) pmcddb039.c pmcddb039.def 52 # gcc -Zdll -Zomf -I$(INC) pmcddb039.c pmcddb039.def 53 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb039.c pmcddb039.def 49 54 rc pmcddb039.res pmcddb039.dll 50 55 … … 53 58 54 59 pmcddb088.dll: pmcddb088.c pmcddb088.res 55 gcc -Zdll -Zomf -I$(INC) pmcddb088.c pmcddb088.def 60 # gcc -Zdll -Zomf -I$(INC) pmcddb088.c pmcddb088.def 61 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb088.c pmcddb088.def 56 62 rc pmcddb088.res pmcddb088.dll 57 63 … … 60 66 61 67 pmcddb033.dll: pmcddb033.c pmcddb033.res 62 gcc -Zdll -Zomf -I$(INC) pmcddb033.c pmcddb033.def 68 # gcc -Zdll -Zomf -I$(INC) pmcddb033.c pmcddb033.def 69 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb033.c pmcddb033.def 63 70 rc pmcddb033.res pmcddb033.dll 64 71 … … 67 74 68 75 pmcddb034.dll: pmcddb034.c pmcddb034.res 69 gcc -Zdll -Zomf -I$(INC) pmcddb034.c pmcddb034.def 76 # gcc -Zdll -Zomf -I$(INC) pmcddb034.c pmcddb034.def 77 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb034.c pmcddb034.def 70 78 rc pmcddb034.res pmcddb034.dll 71 79 -
trunk/mediafolder/c/cddb/res/pmcddb001.DEF
r104 r127 22 22 DATA MULTIPLE NONSHARED 23 23 EXPORTS 24 queryLanguage = _queryLanguage24 queryLanguage -
trunk/mediafolder/c/cddb/res/pmcddb007.DEF
r109 r127 23 23 DATA MULTIPLE NONSHARED 24 24 EXPORTS 25 queryLanguage = _queryLanguage25 queryLanguage 26 26 -
trunk/mediafolder/c/cddb/res/pmcddb031.DEF
r104 r127 22 22 DATA MULTIPLE NONSHARED 23 23 EXPORTS 24 queryLanguage = _queryLanguage24 queryLanguage -
trunk/mediafolder/c/cddb/res/pmcddb033.DEF
r102 r127 26 26 DATA MULTIPLE NONSHARED 27 27 EXPORTS 28 queryLanguage = _queryLanguage28 queryLanguage -
trunk/mediafolder/c/cddb/res/pmcddb034.DEF
r102 r127 22 22 DATA MULTIPLE NONSHARED 23 23 EXPORTS 24 queryLanguage = _queryLanguage24 queryLanguage 25 25 -
trunk/mediafolder/c/cddb/res/pmcddb039.DEF
r104 r127 22 22 DATA MULTIPLE NONSHARED 23 23 EXPORTS 24 queryLanguage = _queryLanguage24 queryLanguage -
trunk/mediafolder/c/cddb/res/pmcddb049.DEF
r109 r127 22 22 DATA MULTIPLE NONSHARED 23 23 EXPORTS 24 queryLanguage = _queryLanguage24 queryLanguage -
trunk/mediafolder/c/cddb/res/pmcddb088.DEF
r104 r127 22 22 DATA MULTIPLE NONSHARED 23 23 EXPORTS 24 queryLanguage = _queryLanguage24 queryLanguage
Note:
See TracChangeset
for help on using the changeset viewer.