rev to 0.9.1, opt instead of debug Onyx builds

classilla · Jul 11, 2018 · ca0d0ab · ca0d0ab
1 parent c81a1db
commit ca0d0ab
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,7 @@ onyx
 *.exe
 *.xpi
 *.dmg
-mac/Onyx.app
-mac/Onyx.app/*
+mac/*
 *.dSYM
 *.dSYM/*
 .DS_Store

diff --git a/Info.plist b/Info.plist
@@ -17,9 +17,9 @@
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleShortVersionString</key>
-	<string>0.9.0.0</string>
+	<string>0.9.1.0</string>
         <key>CFBundleVersion</key>
-        <string>900.0.0</string>
+        <string>901.0.0</string>
         <key>LSMinimumSystemVersion</key>
         <string>10.9</string>
 </dict>

diff --git a/Makefile.generic b/Makefile.generic
@@ -1,14 +1,16 @@
 CC	= /usr/bin/gcc
+CFLAGS	?= -O2
+#CFLAGS	?= -DDEBUG
 RM	= /bin/rm
 default: onyx
 .PHONY: default clean
 
 onyx: onyx.c
-	$(CC) -DDEBUG -g -o onyx onyx.c
+	$(CC) $(CFLAGS) -g -o onyx onyx.c
 
 # Optional. client.pl is preferred for testing.
 client: client.c
-	$(CC) -DDEBUG -g -o client client.c
+	$(CC) $(CFLAGS) -g -o client client.c
 
 clean:
 	$(RM) -rf onyx client onyx.dSYM client.dSYM
diff --git a/Makefile.mxe b/Makefile.mxe
@@ -1,13 +1,15 @@
 MXE_ROOT=$(HOME)/mxe
 CC=$(MXE_ROOT)/usr/bin/i686-w64-mingw32.static-gcc
+CFLAGS ?= -O2
+#CFLAGS ?= -DDEBUG
 MAKENSIS=$(MXE_ROOT)/usr/i686-w64-mingw32.static/bin/makensis
 RM=/bin/rm
 
 onyxinst.exe: onyx.exe onyx.nsi wintest.exe
 	$(MAKENSIS) onyx.nsi
 
 onyx.exe: onyx.c
-	$(CC) -DDEBUG -g -o onyx.exe onyx.c -lws2_32
+	$(CC) $(CFLAGS) -g -o onyx.exe onyx.c -lws2_32
 
 wintest.exe: wintest.c
 	$(CC) -g -o wintest.exe wintest.c -lws2_32

diff --git a/mac/Mac Read Me.rtf b/mac/Mac Read Me.rtf
diff --git a/onyx.c b/onyx.c
@@ -28,6 +28,7 @@
 #include <netdb.h>
 #endif
 
+/* Protocol version, not file version. */
 #define VERSION "1"
 
 // Size per network read (max). This seems pretty good.

diff --git a/onyx.nsi b/onyx.nsi
@@ -4,8 +4,8 @@ Name "OverbiteNX Onyx Component"
 OutFile "onyxinst.exe"
 InstallDir "$LOCALAPPDATA\OverbiteNX"
 
-VIProductVersion "0.9.0.0"
-VIAddVersionKey "FileVersion" "0.9.0.0"
+VIProductVersion "0.9.1.0"
+VIAddVersionKey "FileVersion" "0.9.1.0"
 VIAddVersionKey "ProductName" "OverbiteNX Onyx Component Installer"
 VIAddVersionKey "CompanyName" "The Overbite Project"
 VIAddVersionKey "LegalCopyright" "© 2018 Cameron Kaiser"