1.6d: pnmpack

Special-graphic-formats · Jul 11, 2022 · f720db0 · f720db0
1 parent 2df6a68
commit f720db0
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 11 deletions.
diff --git a/source/Makefile → Makefile b/source/Makefile → Makefile
@@ -1,21 +1,21 @@
 # packXXX Makefile, based on UniMake: Universal Makefile
 # Created by Matthias Stirner, 01/2016
 
-TARGET   = packPNM
+TARGET   = pnmpack
 CC       = gcc
 CPP      = g++
 RC       = windres -O coff
-CPPFLAGS = -I. -O3 -Wall -pedantic -funroll-loops -ffast-math -fsched-spec-load -fomit-frame-pointer
-LDFLAGS  = -static -static-libgcc -static-libstdc++
-CSRC     = $(wildcard *.c)
-CPPSRC   = $(wildcard *.cpp)
-DEPS     = $(wildcard *.h) Makefile
+CPPFLAGS = -I./src -O3 -Wall -pedantic -funroll-loops -ffast-math -fsched-spec-load -fomit-frame-pointer 
+LDFLAGS  = -s #-static -static-libgcc -static-libstdc++
+CSRC     = $(wildcard src/*.c)
+CPPSRC   = $(wildcard src/*.cpp)
+DEPS     = $(wildcard src/*.h) Makefile
 OBJ      = $(patsubst %.c,%.o,$(CSRC)) $(patsubst %.cpp,%.o,$(CPPSRC))
 
 # conditional stuff
 ifeq ($(OS),Windows_NT)
 LDFLAGS  += -lpthread -L libwinpthread-1.dll
-RES       = icons.res
+RES       = src/icons.res
 UPX      := -upx --best --lzma $(TARGET).exe
 else
 CPPFLAGS += -DUNIX
@@ -25,7 +25,7 @@ UPX       =
 endif
 
 %.o: %.cpp $(DEPS)
-	$(CPP) -c -o $@ $< $(CPPFLAGS)
+	$(CPP) $(CPPFLAGS) -c -o $@ $<
 
 %.res: %.rc
 	@-$(RC) $< $@
@@ -53,4 +53,4 @@ dll: $(OBJ)
 
 clean:
 	@echo clean...
-	@-rm *.o *.a $(TARGET) $(TARGET).exe $(TARGET).dll
+	@-rm src/*.o src/*.a $(TARGET) $(TARGET).exe $(TARGET).dll
diff --git a/source/icons.res b/source/icons.res
diff --git a/source/app_icon.ico → src/app_icon.ico b/source/app_icon.ico → src/app_icon.ico
diff --git a/source/aricoder.cpp → src/aricoder.cpp b/source/aricoder.cpp → src/aricoder.cpp
diff --git a/source/aricoder.h → src/aricoder.h b/source/aricoder.h → src/aricoder.h
diff --git a/source/bitops.cpp → src/bitops.cpp b/source/bitops.cpp → src/bitops.cpp
diff --git a/source/bitops.h → src/bitops.h b/source/bitops.h → src/bitops.h
diff --git a/source/file_icon.ico → src/file_icon.ico b/source/file_icon.ico → src/file_icon.ico
diff --git a/source/icons.rc → src/icons.rc b/source/icons.rc → src/icons.rc
diff --git a/source/packpnm.cpp → src/packpnm.cpp b/source/packpnm.cpp → src/packpnm.cpp
@@ -2805,8 +2805,7 @@ INTERN inline void set_extension( const char* filename, const char* extension )
 	char* extstr;
 
 	// find position of extension in filename	
-	extstr = ( strrchr( filename, '.' ) == NULL ) ?
-		strrchr( filename, '\0' ) : strrchr( filename, '.' );
+	extstr = ( strrchr( filename, '.' ) == NULL ) ? (char*)strrchr( filename, '\0' ) : (char*)strrchr( filename, '.' );
 
 	// set new extension
 	if ( extension != NULL ) {

diff --git a/source/packpnmdll.h → src/packpnmdll.h b/source/packpnmdll.h → src/packpnmdll.h
diff --git a/source/packpnmlib.h → src/packpnmlib.h b/source/packpnmlib.h → src/packpnmlib.h
diff --git a/source/ppnmbitlen.h → src/ppnmbitlen.h b/source/ppnmbitlen.h → src/ppnmbitlen.h
diff --git a/source/ppnmtbl.h → src/ppnmtbl.h b/source/ppnmtbl.h → src/ppnmtbl.h